From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs |   51 +++++++++++++++++++++++++++++++--------------------
 1 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
index b73cdc7..0f40b6d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
@@ -32,18 +32,6 @@
         }
 
         /// <summary>
-        /// 褰撳墠Wifi鐨処p鍦板潃
-        /// </summary>
-        public string IpAddress
-        {
-            get
-            {
-                var temp = new Shared.Net.NetWiFi();
-                return temp.GetIPAddress();
-            }
-        }
-
-        /// <summary>
         /// 褰撳墠鏄惁鏄綉鍏崇儹鐐�
         /// </summary>
         public bool IsGatewayHotspot
@@ -52,7 +40,24 @@
             {
                 string myId = this.SSID;
 
-                if (myId.StartsWith("hdlZigbeeGW") == true)
+                if (myId != null && myId.StartsWith("hdlZigbeeGW") == true)
+                {
+                    return true;
+                }
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 褰撳墠鏄惁鏄疢ini缃戝叧鐑偣
+        /// </summary>
+        public bool IsMiniGatewayHotspot
+        {
+            get
+            {
+                string myId = this.SSID;
+
+                if (myId != null && myId.StartsWith("hdlZigbeeGW-") == true)
                 {
                     return true;
                 }
@@ -68,7 +73,12 @@
             get
             {
 #if iOS
-                return string.Empty;
+                string ssiD = Shared.WiimuUPnP.SSID;
+                if (string.IsNullOrEmpty(ssiD) == false && ssiD.StartsWith("\"") && ssiD.EndsWith("\""))
+                {
+                    ssiD = ssiD.Substring(1, ssiD.Length - 2);
+                }
+                return ssiD;
 #endif
 #if Android
                 string ssiD = null;
@@ -286,14 +296,14 @@
         /// <param name="wifiPsw">wifi瀵嗙爜</param>
         /// <param name="p2">鎴戜篃涓嶇煡閬撹繖涓槸浠�涔堜笢瑗�</param>
         /// <returns></returns>
-        public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "1")
+        public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "")
         {
             if (hdlWiFi == null)
             {
-                Com.Mediatek.Elian.ElianNative.LoadLib();
+                var result2 = Com.Mediatek.Elian.ElianNative.LoadLib();
                 //鍒濆鍖朩i-Fi閰嶇綉
                 this.hdlWiFi = new Com.Mediatek.Elian.ElianNative();
-                hdlWiFi.InitSmartConnection(null, 1, 1);
+                var value = hdlWiFi.InitSmartConnection(null, 1, 1);
             }
             //寮�濮媁i-Fi閰嶇綉
             var result = hdlWiFi.StartSmartConnection(wifiName, wifiPsw, p2);
@@ -308,7 +318,8 @@
             if (hdlWiFi != null)
             {
                 //鍋滄Wi-Fi閰嶇綉
-                hdlWiFi.StopSmartConnection();
+                var result = hdlWiFi.StopSmartConnection();
+                hdlWiFi = null;
             }
         }
 #endif
@@ -320,10 +331,10 @@
         /// <param name="wifiPsw">wifi瀵嗙爜</param>
         /// <param name="p2">鎴戜篃涓嶇煡閬撹繖涓槸浠�涔堜笢瑗�</param>
         /// <returns></returns>
-        public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "1")
+        public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "")
         {
             //鍒濆鍖朩i-Fi杩炴帴
-            Com.Mediatek.Elian.ElianNative.InitSmartConnection(null, 1, 1);
+            Com.Mediatek.Elian.ElianNative.InitSmartConnection("1", 1, 1);
             //寮�濮媁i-Fi杩炴帴
             var result = Com.Mediatek.Elian.ElianNative.StartSmartConnection(wifiName, wifiPsw, p2);
             return true;

--
Gitblit v1.8.0