合并代码

黄学彪

2020-01-06 72be4f06a683de33ddd563c8447c39f7f17e5b7d

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



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



            //WIFI

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

            //var rowWifi = new FrameCaptionViewControl("WiFi", "software");

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

            rowWifi.UseClickStatu = false;

            rowWifi.Y = Application.GetRealHeight(124);

            frameBack.AddChidren(rowWifi);

@@ -85,8 +105,8 @@
            var btnHelp = this.AddHelpControl();

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

            {

                var form = new DeviceDirection.DeviceDirectionHelpForm();

                form.AddForm("WirelessUdp");

                var form = new AddGatewayHelpForm();

                form.AddForm("Udp");

            };



            //下一步

@@ -104,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);

            };