From 5a5a2b696866f947b6025d26c3302e8ffef46435 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 11 一月 2021 16:11:20 +0800
Subject: [PATCH] 2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs
index ea6871a..49afd5a 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs
@@ -307,7 +307,7 @@
if (goNext) {
//鍏堥噸缃�
goNext = false;
- //缃戝叧鐗堟湰绗﹀悎瑕佹眰锛屽垽鏂槸鍚︾粦瀹氱綉鍏虫垚鍔�,缁戝畾鎴愬姛浜嗘墠鑳借繘琛屼笅涓�姝�
+ //缃戝叧鐗堟湰绗﹀悎瑕佹眰锛岀户缁垽鏂槸鍚︾粦瀹氱綉鍏虫垚鍔�,缁戝畾鎴愬姛浜嗘墠鑳借繘琛屼笅涓�姝ヨ烦杞澶囨悳绱㈤〉闈�
goNext = CheckIfBindGatewaySuccess (common);
}
@@ -322,6 +322,7 @@
inThisView = false;
if (inView != null) {
Utlis.WriteLine ("inView != null");
+ //璺宠浆璁惧鎼滅储椤甸潰
var deviceListView = new GuideSettingGateway (common);
(inView.Parent as PageLayout).AddChidren (deviceListView);
deviceListView.ShowPage ();
@@ -358,8 +359,11 @@
{
try {
if (UserConfig.Instance.CheckHomeGatewaysNotEmpty ()) {
- //涔嬪墠缁戝畾杩囩綉鍏筹紝骞朵笖鍜屽綋鍓嶆悳绱㈠埌鍒扮綉鍏充竴鑷�
- if (UserConfig.Instance.HomeGateway.mac.ToUpper () == gatewayBase.MAC.Replace (".", "").ToUpper ()) {
+ //涔嬪墠缁戝畾杩囩綉鍏筹紝骞朵笖鍜屽綋鍓嶆悳绱㈠埌鍒扮綉鍏充竴鑷�,瀛愮綉鍙疯澶囧彿閮借涓�鑷�
+ if (UserConfig.Instance.HomeGateway.mac.ToUpper () == gatewayBase.MAC.Replace (".", "").ToUpper ()
+ && UserConfig.Instance.HomeGateway.subnetId == gatewayBase.SubnetID
+ && UserConfig.Instance.HomeGateway.deviceId == gatewayBase.DeviceID
+ ) {
return true;
}
}
@@ -368,7 +372,7 @@
//閲嶆柊缁戝畾
var bindGatewayObj = new BindGatewayObj () {
homeId = UserConfig.Instance.CurrentRegion.Id,
- subnetId = gatewayBase.sceneID,
+ subnetId = gatewayBase.SubnetID,
deviceId = gatewayBase.DeviceID,
gatewayType = GatewayType.BUSUDPGATEWAY.ToString (),
mac = gatewayMAC
@@ -386,7 +390,7 @@
IMessageCommon.Current.ShowErrorInfoAlter (revertObj.Code);
}
} catch {
-
+ Utlis.WriteLine ("缁戝畾缃戝叧澶辫触");
}
return false;
}
--
Gitblit v1.8.0