代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

 ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs

@@ -87,6 +87,7 @@
            btnTitle.Y = Application.GetRealHeight(112);

            btnTitle.TextColor = UserCenterColor.Current.White;

            btnTitle.TextSize = 24;

            btnTitle.IsBold = true;

            btnTitle.TextID = R.MyInternationalizationString.UserCenter;

            bodyFrameLayout.AddChidren(btnTitle);



@@ -95,7 +96,7 @@
            frameBack.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;

            frameBack.Y = Application.GetRealHeight(380);

            frameBack.Gravity = Gravity.CenterHorizontal;

            frameBack.Radius = 12;

            frameBack.Radius = (uint)Application.GetRealHeight(29);

            frameBack.Width = bodyFrameLayout.Width - Application.GetRealWidth(29 * 2);

            frameBack.Height = bodyFrameLayout.Height - Application.GetRealHeight(380) + Application.GetRealHeight(100);

            bodyFrameLayout.AddChidren(frameBack);

@@ -147,6 +148,7 @@


            //用户昵称

            this.btnUserName = new NormalViewControl(605, 60, true);

            btnUserName.IsBold = true;

            btnUserName.X = btnUserIcon.Right + Application.GetRealWidth(5);

            btnUserName.Y = Application.GetRealHeight(43);

            if (UserCenterResourse.UserInfo != null)

@@ -190,7 +192,7 @@
                frameMainMenuBack.Gravity = Gravity.CenterHorizontal;

                frameMainMenuBack.Height = Application.GetRealHeight(371);

                frameMainMenuBack.Width = frameWhite.Width - Application.GetRealWidth(29 * 2);

                frameMainMenuBack.Radius = 10;

                frameMainMenuBack.Radius = (uint)Application.GetRealHeight(17);

                frameMainMenuBack.BackgroundColor = UserCenterColor.Current.White;

                frameWhite.AddChidren(frameMainMenuBack);

            }