合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

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

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



            HdlThreadLogic.Current.RunMainInThread(() =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                //初始化中部信息

                this.InitMiddleFrame();

                //打开进度条

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



@@ -51,7 +69,7 @@
            frameBack.AddChidren(btnTitle);



            //WIFI

            var rowWifi = new FrameCaptionViewControl("WiFi", HdlWifiLogic.Current.SSID);

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

            rowWifi.UseClickStatu = false;

            rowWifi.Y = Application.GetRealHeight(124);

            frameBack.AddChidren(rowWifi);

@@ -80,15 +98,15 @@
            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 DeviceDirection.DeviceDirectionHelpForm();

                form.AddForm("WirelessUdp");

                var form = new AddGatewayHelpForm();

                form.AddForm("Udp");

            };



            //下一步

@@ -106,7 +124,7 @@
                    return;

                }

                //开始Wi-Fi配网

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

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

                var form = new WirelessUdpSearchForm();

                this.AddFromAndRemoveNowForm(form);

            };