From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceFixedAttributeLogic.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceFixedAttributeLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceFixedAttributeLogic.cs
index fdb4e4a..db5cd51 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceFixedAttributeLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceFixedAttributeLogic.cs
@@ -52,11 +52,11 @@
lock (this.hsGetHardInfoDevice)
{
//鍏堢Щ闄�
- this.RemoveDeviceHardInfoThread(device);
-
- string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- this.hsGetHardInfoDevice.Add(mainkeys);
-
+ string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ if (this.hsGetHardInfoDevice.Contains(mainKeys) == true)
+ {
+ this.hsGetHardInfoDevice.Remove(mainKeys);
+ }
if (HdlGatewayReceiveLogic.Current.IsEsixt("DeviceGetFixedAttribute") == false)
{
//娣诲姞浜嬩欢
@@ -89,6 +89,8 @@
//涓嶉渶瑕佸彂閫�
return;
}
+ string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ this.hsGetHardInfoDevice.Add(mainkeys);
//鍙戦��
var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
jObject.Add("Data", data);
--
Gitblit v1.8.0