From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
index 6aee9ce..cde9b36 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
@@ -38,13 +38,14 @@
{
get
{
- string myId = this.SSID;
+ //string myId = this.SSID;
- if (myId != null && myId.StartsWith("hdlZigbeeGW") == true)
- {
- return true;
- }
- return false;
+ //if (myId != null && myId.StartsWith("hdlZigbeeGW") == true)
+ //{
+ // return true;
+ //}
+ //2021.03.22 涓汉鍐冲畾,涓嶅啀妫�娴嬭繖涓笢瑗�
+ return true;
}
}
@@ -55,13 +56,14 @@
{
get
{
- string myId = this.SSID;
+ //string myId = this.SSID;
- if (myId != null && myId.StartsWith("hdlZigbeeGW-") == true)
- {
- return true;
- }
- return false;
+ //if (myId != null && myId.StartsWith("hdlZigbeeGW-") == true)
+ //{
+ // return true;
+ //}
+ //2021.03.22 涓汉鍐冲畾,涓嶅啀妫�娴嬭繖涓笢瑗�
+ return true;
}
}
@@ -535,7 +537,9 @@
public bool StartSmartConnection(string wifiName, string wifiPsw, string p2 = "")
{
//鍒濆鍖朩i-Fi杩炴帴
- Com.Mediatek.Elian.ElianNative.InitSmartConnection("1", 1, 1);
+ //Com.Mediatek.Elian.ElianNative.InitSmartConnection("1", 1, 1);
+ Com.Mediatek.Elian.ElianNative.InitSmartConnection( 1, 1);
+
//寮�濮媁i-Fi杩炴帴
var result = Com.Mediatek.Elian.ElianNative.StartSmartConnection(wifiName, wifiPsw, p2);
return true;
--
Gitblit v1.8.0