合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -75,12 +75,6 @@
            //清空bodyFrame

            this.ClearBodyFrame();



            //信息提示控件

            this.msgControl = new MessageManagementControl();

            msgControl.Y = Application.GetRealHeight(127);

            msgControl.X = Application.GetRealWidth(953);

            bodyFrameLayout.AddChidren(this.msgControl);



            //个人中心

            var btnTitle = new NormalViewControl(350, 100, true);

            btnTitle.X = ControlCommonResourse.XXLeft;

@@ -90,6 +84,21 @@
            btnTitle.IsBold = true;

            btnTitle.TextID = R.MyInternationalizationString.UserCenter;

            bodyFrameLayout.AddChidren(btnTitle);



            var btnBack1 = new PicViewControl(1031, 942);

            btnBack1.Y = btnTitle.Bottom - Application.GetRealHeight(10);

            btnBack1.UnSelectedImagePath = "Center/MainBack1.png";

            bodyFrameLayout.AddChidren(btnBack1);

            var btnBack2 = new PicViewControl(392, 172);

            btnBack2.X = Application.GetRealWidth(688);

            btnBack2.UnSelectedImagePath = "Center/MainBack2.png";

            bodyFrameLayout.AddChidren(btnBack2);



            //信息提示控件

            this.msgControl = new MessageManagementControl();

            msgControl.Y = Application.GetRealHeight(127);

            msgControl.X = Application.GetRealWidth(953);

            bodyFrameLayout.AddChidren(this.msgControl);



            //白框

            var frameBack = new FrameLayout();

@@ -136,14 +145,15 @@
                form.AddForm();

            };



            if (UserCenterResourse.UserInfo.AuthorityNo == 1)

            //皇冠

            this.btnImperialCrown = new IconViewControl(60);

            btnImperialCrown.X = Application.GetRealWidth(346);

            btnImperialCrown.Y = Application.GetRealHeight(475);

            btnImperialCrown.UnSelectedImagePath = "Center/ImperialCrown.png";

            bodyFrameLayout.AddChidren(btnImperialCrown);

            if (UserCenterResourse.UserInfo.AuthorityNo != 1)

            {

                //皇冠

                this.btnImperialCrown = new IconViewControl(60);

                btnImperialCrown.X = Application.GetRealWidth(346);

                btnImperialCrown.Y = Application.GetRealHeight(475);

                btnImperialCrown.UnSelectedImagePath = "Center/ImperialCrown.png";

                bodyFrameLayout.AddChidren(btnImperialCrown);

                btnImperialCrown.Visible = false;

            }



            //用户昵称

@@ -475,17 +485,14 @@
                //用户身份

                btnAuthority.Text = UserCenterResourse.UserInfo.AuthorityText;

            }

            if (this.btnImperialCrown != null)

            //皇冠

            if (UserCenterResourse.UserInfo.AuthorityNo != 1)

            {

                //皇冠

                if (UserCenterResourse.UserInfo.AuthorityNo != 1)

                {

                    this.btnImperialCrown.Visible = false;

                }

                else

                {

                    this.btnImperialCrown.Visible = true;

                }

                this.btnImperialCrown.Visible = false;

            }

            else

            {

                this.btnImperialCrown.Visible = true;

            }



            //刷新信息提示控件