From bba578c2f0acf2eca747edcb69426771e0cadd32 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 18:20:50 +0800
Subject: [PATCH] 2020-03-23-3
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
index 23e7d57..1ec286d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
@@ -234,7 +234,7 @@
//澶勭悊璁惧
foreach (var data2 in allData.DeviceList)
{
- string mainKey = data2.MacAddr + data2.Epoint;
+ string mainKey = LocalDevice.Current.GetDeviceMainKeys(data2.MacAddr, data2.Epoint);
//浼犳劅鍣ㄨ澶囦俊鎭�
var Deviceinfo = new Safeguard.ZoneDeviceListData();
Deviceinfo.IsBypass = data2.IsBypass;
@@ -295,7 +295,7 @@
if (data.Type == 0)
{
//鏈湴鏄惁鏈夎繖涓澶�
- string mainKey = data.DeviceAddr + data.Epoint;
+ string mainKey = LocalDevice.Current.GetDeviceMainKeys(data.DeviceAddr, data.Epoint);
//鎶ヨ淇℃伅
zoneInfo.dicAlarmDevice[mainKey] = data;
CommonDevice device = LocalDevice.Current.GetDevice(mainKey);
@@ -559,7 +559,7 @@
//涓�鎵硅澶囬噷闈紝鎴愬姛娣诲姞鐨�
if (data.Status == 0)
{
- listSuccess.Add(data.MacAddr + data.Epoint);
+ listSuccess.Add(LocalDevice.Current.GetDeviceMainKeys(data.MacAddr, data.Epoint));
}
else if (data.Status == 1)
{
@@ -745,7 +745,7 @@
{
if (data.Status == 0)
{
- listKeys.Add(data.MacAddr + data.Epoint);
+ listKeys.Add(LocalDevice.Current.GetDeviceMainKeys(data.MacAddr, data.Epoint));
}
}
--
Gitblit v1.8.0