合并xm2021-01-13 wjc2021-02-06

黄学彪

2021-01-14 d78515ac4ac8cf4a1785d9df18058d6724f12b79

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

@@ -36,12 +36,12 @@
            frameBack.BackgroundColor = UserCenterColor.Current.White;

            bodyFrameLayout.AddChidren(frameBack);



            //请选择网络

            //请输入WIFI和密码

            var btnTitle = new NormalViewControl(600, 64, true);

            btnTitle.X = ControlCommonResourse.XXLeft;

            btnTitle.Y = Application.GetRealHeight(30);

            btnTitle.TextSize = 15;

            btnTitle.TextID = R.MyInternationalizationString.uPleaseSelectNetwork;

            btnTitle.TextID = R.MyInternationalizationString.uPleaseInputWifiAndPassword;

            frameBack.AddChidren(btnTitle);



            //WIFI

@@ -87,6 +87,31 @@
            btnMsg.TextColor = UserCenterColor.Current.ErrorColor;

            bodyFrameLayout.AddChidren(btnMsg);



            //发送局域网账号、密码

            var btnMsgTitle = new NormalViewControl(500, 60, true);

            btnMsgTitle.TextID = R.MyInternationalizationString.uSendLanAccountAndPassword;

            btnMsgTitle.X = ControlCommonResourse.XXLeft;

            btnMsgTitle.Y = frameBack.Bottom + Application.GetRealHeight(369);

            btnMsgTitle.IsBold = true;

            bodyFrameLayout.AddChidren(btnMsgTitle);



            //1.填写路由器的账号和密码

            //2.点击下一步,将路由器账号和密码发送至网关

            //3.网关接收成功,系统指示灯SYS闪烁

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

            int yy = btnMsgTitle.Bottom + Application.GetRealHeight(23);

            foreach (var msg in ArryMsg)

            {

                var btnTip = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);

                btnTip.Text = msg;

                btnTip.Y = yy;

                btnTip.X = btnMsgTitle.X;

                btnTip.TextColor = UserCenterColor.Current.TextGrayColor1;

                btnTip.TextSize = 12;

                bodyFrameLayout.AddChidren(btnTip);

                yy = btnTip.Bottom;

            }



            //查看帮助

            var btnHelp = this.AddHelpControl();

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

@@ -125,7 +150,7 @@
                }



                this.CloseForm();

                var form = new MiniGatewayDirection3Form();

                var form = new WirelessApDirection3Form();

                form.AddForm();

            };

        }