新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

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

@@ -23,14 +23,35 @@
            //设置头部信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddWirelessGateway));



            //初始化中部信息

            this.InitMiddleFrame();

            HdlThreadLogic.Current.RunThread(() =>

            {

                //打开进度条

                this.ShowProgressBar();

                var ssid = HdlWifiLogic.Current.SSID;

                if (ssid == null)

                {

                    //获取网络SSID失败

                    string msg = Language.StringByID(R.MyInternationalizationString.uGetSsidFail);

                    this.ShowMassage(ShowMsgType.Tip, msg);

                    //关闭进度条

                    this.CloseProgressBar(ShowReLoadMode.YES);

                    return;

                }

                //关闭进度条

                this.CloseProgressBar();



                HdlThreadLogic.Current.RunMain(() =>

                {

                    //初始化中部信息

                    this.InitMiddleFrame(ssid);

                });

            });

        }



        /// <summary>

        /// 初始化中部信息

        /// </summary>

        private void InitMiddleFrame()

        private void InitMiddleFrame(string ssid)

        {

            bodyFrameLayout.RemoveAll();



@@ -41,19 +62,14 @@


            //请选择网络

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

            btnTitle.X = ControlCommonResourse.XXLeft;

            btnTitle.X = HdlControlResourse.XXLeft;

            btnTitle.Y = Application.GetRealHeight(30);

            btnTitle.TextSize = 15;

            btnTitle.TextID = R.MyInternationalizationString.uPleaseSelectNetwork;

            frameBack.AddChidren(btnTitle);



            //WIFI

            string ssiD = Shared.WiimuUPnP.SSID;

            if (string.IsNullOrEmpty(ssiD) == false && ssiD.StartsWith("\"") && ssiD.EndsWith("\""))

            {

                ssiD = ssiD.Substring(1, ssiD.Length - 2);

            }

            var rowWifi = new FrameCaptionViewControl("WiFi", ssiD);

            var rowWifi = new FrameCaptionViewControl("WiFi", ssid);

            rowWifi.UseClickStatu = false;

            rowWifi.Y = Application.GetRealHeight(124);

            frameBack.AddChidren(rowWifi);

@@ -78,12 +94,20 @@
            };



            var btnMsg = new NormalViewControl(btnPsw.txtInput.Width, false);

            btnMsg.X = btnPsw.txtInput.X;

            btnMsg.X = HdlControlResourse.XXLeft;

            btnMsg.Y = frameBack.Bottom + Application.GetRealHeight(23);

            btnMsg.TextSize = 12;

            btnMsg.Height = Application.GetRealHeight(40);

            btnMsg.TextColor = UserCenterColor.Current.Red;

            btnMsg.TextColor = UserCenterColor.Current.ErrorColor;

            bodyFrameLayout.AddChidren(btnMsg);



            //查看帮助

            var btnHelp = this.AddHelpControl();

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

            {

                var form = new AddGatewayHelpForm();

                form.AddForm("Udp");

            };



            //下一步

            var btnNext = new BottomClickButton();

@@ -95,18 +119,14 @@
                btnMsg.Text = string.Empty;

                if (btnPsw.Text == string.Empty)

                {

                    //请输入网络密码

                    //请输入Wifi密码

                    btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInputWifiPassword);

                    return;

                }



                //初始化Wi-Fi连接

                //var hdlWifi = new Com.Hdl.Hdlelianzigbee.ElianNative();

                //hdlWifi.InitSmartConnection(null, 1, 1);

                ////开始Wi-Fi连接

                //var result = hdlWifi.StartSmartConnection(rowWifi.Text, btnPsw.Text, "1");

                //var form = new WirelessGwClickButtonForm();

                //this.AddFromAndRemoveNowForm(form);

                //开始Wi-Fi配网

                HdlWifiLogic.Current.StartSmartConnection(rowWifi.Text, btnPsw.Text, "");

                var form = new WirelessUdpSearchForm();

                this.AddFormAndCloseNowForm(form);

            };

        }