From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
old mode 100755
new mode 100644
index b73cdc7..1052a4c
--- 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
@@ -68,7 +56,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 +279,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 +301,8 @@
if (hdlWiFi != null)
{
//鍋滄Wi-Fi閰嶇綉
- hdlWiFi.StopSmartConnection();
+ var result = hdlWiFi.StopSmartConnection();
+ hdlWiFi = null;
}
}
#endif
@@ -320,10 +314,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