From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
index 3772876..b749d91 100755
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
+++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
@@ -1220,7 +1220,7 @@
dicRealRoom[gateway.GwId] = gateway.RoomId;
}
//鑾峰彇鍏ㄩ儴鐗╃悊璁惧鎵�灞炴埧闂寸殑璁板綍
- var dicDeviceRoom = Common.LocalDevice.Current.GetAllRealDeviceRoomData();
+ var dicDeviceRoom = HdlRoomLogic.Current.GetAllRealDeviceRoomData();
foreach (var strMac in dicDeviceRoom.Keys)
{
dicRealRoom[strMac] = dicDeviceRoom[strMac];
@@ -1353,7 +1353,7 @@
//鏇存敼鐗╃悊璁惧鎵�鍦ㄧ殑鎴块棿
if (this.modelData.dicDeviceTemplateRealRoom.ContainsKey(targetMac) == true)
{
- Common.LocalDevice.Current.SaveRealDeviceRoomId(listDevice, this.modelData.dicDeviceTemplateRealRoom[targetMac], false);
+ HdlRoomLogic.Current.SaveRealDeviceRoomId(listDevice, this.modelData.dicDeviceTemplateRealRoom[targetMac], false);
}
//璁板綍缂撳瓨
@@ -1496,7 +1496,7 @@
//鍙樻洿缃戝叧鎴块棿
if (this.modelData.dicDeviceTemplateRealRoom.ContainsKey(targetGwid) == true)
{
- HdlGatewayLogic.Current.ChangedGatewayRoom(sourceGwid, this.modelData.dicDeviceTemplateRealRoom[targetGwid]);
+ HdlRoomLogic.Current.ChangedGatewayRoom(sourceGwid, this.modelData.dicDeviceTemplateRealRoom[targetGwid]);
}
//鍙樻洿缃戝叧鍚嶅瓧
//if (this.modelData.dicGatewayInfo.ContainsKey(targetGwid) == true)
@@ -1851,7 +1851,7 @@
}
}
//铏氭嫙椹卞姩姣旇緝
- if (localGateway.LinuxImageType != 6)
+ if (HdlGatewayLogic.Current.CheckGatewayHadDriveCode(localGateway) == true)
{
foreach (var localCode in localGateway.DriveCodeList)
{
--
Gitblit v1.8.0