Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApDirection2Form.cs

@@ -69,8 +69,7 @@
            framePic.BackgroundImagePath = "Gateway/WirelessGatewaySearching.png";

            bodyFrameLayout.AddChidren(framePic);



            //跳转到移动设备WLAN设置

            //选择hdlZigbeeGW-xxxx网络

            //手机去设置连接网关热点{0}即hdlZigbeeGW-xxxx,密码hdl123456{0}可查看网关背面标签查看热点名字和密码

            string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddApWirelessGatewayMsg2).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);

            int yy = framePic.Bottom + Application.GetRealHeight(213);

            foreach (var msg in ArryMsg)

@@ -98,7 +97,7 @@
            };

            bodyFrameLayout.AddChidren(btnSettion);

            //底线

            int lineWidth = btnSettion.GetRealWidthByText(12);

            int lineWidth = btnSettion.GetRealWidthByText();

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

            btnLine1.BackgroundColor = 0xff0075ff;

            btnLine1.Gravity = Gravity.CenterHorizontal;

@@ -109,8 +108,8 @@
            var btnHelp = this.AddHelpControl();

            btnHelp.ButtonClickEvent += (sender, e) =>

            {

                var form = new DeviceDirection.DeviceDirectionHelpForm();

                form.AddForm("WirelessUdp");

                var form = new AddGatewayHelpForm();

                form.AddForm("Ap");

            };

        }