From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
index b1c9f58..1052a4c 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
@@ -56,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;
@@ -274,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);
@@ -296,7 +301,8 @@
if (hdlWiFi != null)
{
//鍋滄Wi-Fi閰嶇綉
- hdlWiFi.StopSmartConnection();
+ var result = hdlWiFi.StopSmartConnection();
+ hdlWiFi = null;
}
}
#endif
@@ -308,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