全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -48,12 +48,8 @@
            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", HdlWifiLogic.Current.SSID);

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

            rowWifi.UseClickStatu = false;

            rowWifi.Y = Application.GetRealHeight(124);

            frameBack.AddChidren(rowWifi);

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



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

            btnMsg.X = btnPsw.txtInput.X;

            btnMsg.X = ControlCommonResourse.XXLeft;

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

            btnMsg.TextSize = 12;

            btnMsg.Height = Application.GetRealHeight(40);

            btnMsg.TextColor = UserCenterColor.Current.Red;

            bodyFrameLayout.AddChidren(btnMsg);



            //查看帮助

            var btnHelp = this.AddHelpControl();

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

            {

                var form = new DeviceDirection.DeviceDirectionHelpForm();

                form.AddForm("WirelessUdp");

            };



            //下一步

            var btnNext = new BottomClickButton();

@@ -95,18 +99,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, "1");

                var form = new WirelessUdpSearchForm();

                this.AddFromAndRemoveNowForm(form);

            };

        }