合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -46,12 +46,17 @@


            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);

            bodyFrameLayout.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();

@@ -130,7 +135,7 @@
                };

                bodyFrameLayout.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;