请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs

@@ -44,18 +44,27 @@
            //清空bodyFrame

            this.ClearBodyFrame();



            var listBackControl = new VerticalFrameControl();

            listBackControl.Height = bodyFrameLayout.Height;

            bodyFrameLayout.AddChidren(listBackControl);



            bool gateWayExist = HdlGatewayLogic.Current.IsGatewayExist(zbGateway);



            var framePic = new FrameLayout();

            framePic.Width = Application.GetRealWidth(855);

            framePic.Height = Application.GetRealHeight(570);

            framePic.Gravity = Gravity.CenterHorizontal;

            framePic.Y = Application.GetRealHeight(58);

            listBackControl.frameTable.AddChidren(framePic);

            //图片

            var btnImage = new PicViewControl(855, 570, true);

            btnImage.Y = Application.GetRealHeight(58);

            btnImage.Gravity = Gravity.CenterHorizontal;

            HdlGatewayLogic.Current.SetRealGatewayPictrue(btnImage, zbGateway);

            bodyFrameLayout.AddChidren(btnImage);

            var btnImage = new PicViewControl(380, 328, true);

            btnImage.Gravity = Gravity.Center;

            btnImage.UnSelectedImagePath = "Gateway/RealGateway.png";

            framePic.AddChidren(btnImage);



            //初始化桌布

            var tableContr = new InformationEditorControl();

            var listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 708, 1028);

            var listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);



            //设备备注(如果这个网关没有绑定的话,只允许查看,不能更改)

            string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote);

@@ -102,8 +111,8 @@
            btnType.AddBottomLine();

            HdlGatewayLogic.Current.SetGatewayImageText(btnType.txtView, zbGateway);



            //所属区域

            caption = Language.StringByID(R.MyInternationalizationString.uBelongArea);

            //所属住宅

            caption = Language.StringByID(R.MyInternationalizationString.uBelongResidence);

            var btnBeloneArea = new FrameCaptionViewControl(caption, Common.Config.Instance.Home.Name, listview.rowSpace / 2);

            btnBeloneArea.UseClickStatu = false;

            listview.AddChidren(btnBeloneArea);

@@ -112,12 +121,12 @@
            btnBeloneArea.AddBottomLine();



            //完成初始化桌布

            tableContr.FinishInitControl(bodyFrameLayout, listview);

            tableContr.FinishInitControl();



            if (gateWayExist == true)

            {

                //更多配置

                var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(49), false);

                var btnHelp = new NormalViewControl(listBackControl.frameTable.Width, Application.GetRealHeight(49), false);

                btnHelp.Y = Application.GetRealHeight(1388);

                btnHelp.TextSize = 12;

                btnHelp.TextAlignment = TextAlignment.Center;

@@ -128,14 +137,14 @@
                    var form = new GatewayManage.GatewayInfoEditorForm();

                    this.AddFromAndRemoveNowForm(form, zbGateway);

                };

                bodyFrameLayout.AddChidren(btnHelp);

                listBackControl.frameTable.AddChidren(btnHelp);

                //底线

                int lineWidth = btnHelp.GetRealWidthByText(12);

                int lineWidth = btnHelp.GetRealWidthByText();

                var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);

                btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;

                btnLine.Gravity = Gravity.CenterHorizontal;

                btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);

                bodyFrameLayout.AddChidren(btnLine);

                listBackControl.frameTable.AddChidren(btnLine);

            }



            //完成按钮

@@ -148,6 +157,7 @@
                {

                    //如果这个网关还没有绑定,则直接关闭界面

                    this.CloseForm();

                    return;

                }

                //完成按钮按下

                this.FinishButtonClick(btnGateName.Text);