合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs

@@ -31,25 +31,48 @@
        }



        /// <summary>

        /// 当前wifi的SSID,也叫Wifi的名字

        /// 当前wifi的SSID,也叫Wifi的名字(取不到时,会返回null)

        /// </summary>

        public string SSID

        {

            get

            {

                string ssiD = Shared.WiimuUPnP.SSID;

#if iOS

                return string.Empty;

#endif

#if Android

                string ssiD = null;

                HdlThreadLogic.Current.RunThread(() =>

                {

                    Shared.Net.NetWiFi.GetWIFISSID((strId) =>

                    {

                        ssiD = strId;

                    });

                });

                int count = 0;

                while (ssiD == null)

                {

                    System.Threading.Thread.Sleep(50);

                    count++;

                    if (count == 60)

                    {

                        //3秒超时

                        return null;

                    }

                }

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

                {

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

                }

                return ssiD;

#endif

            }

        }

#if Android

        /// <summary>

        /// 定义全局变量

        /// </summary>

        private Com.Hdl.Hdlelianzigbee.ElianNative hdlWiFi = null;

        private Com.Mediatek.Elian.ElianNative hdlWiFi = null;

#endif



        #endregion

@@ -68,8 +91,9 @@
        {

            if (hdlWiFi == null)

            {

                Com.Mediatek.Elian.ElianNative.LoadLib();

                //初始化Wi-Fi配网

                this.hdlWiFi = new Com.Hdl.Hdlelianzigbee.ElianNative();

                this.hdlWiFi = new Com.Mediatek.Elian.ElianNative();

                hdlWiFi.InitSmartConnection(null, 1, 1);

            }

            //开始Wi-Fi配网

@@ -116,6 +140,22 @@
        }

#endif



        /// <summary>

        /// 打开手机wifi设置界面

        /// </summary>

        public void OpenAppWifiSettion()

        {

            if (Application.DeviceType == Shared.Device.Android)

            {

                ///打开WI-IF界面

                CommonClass.OpenAction("android.settings.WIFI_SETTINGS");

            }

            else

            {

                CommonClass.OpenAction("App-Prefs:root=WIFI");

            }

        }



        #endregion

    }

}