From 31497bb69602433d94c8a28ea01c3ee3c7cc8576 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 24 十月 2019 14:32:30 +0800 Subject: [PATCH] 完全合并了Wjc,Xm 的 代码 --- ZigbeeApp/Shared/Common/Device.cs | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs index 77f300a..85ac646 100755 --- a/ZigbeeApp/Shared/Common/Device.cs +++ b/ZigbeeApp/Shared/Common/Device.cs @@ -1573,12 +1573,14 @@ dic[listDevice[i].DeviceAddr].Add(listDevice[i]); } var list = new List<CommonDevice>(); + var listCheck = new HashSet<string>(); foreach (var listSort in this.dicDeviceSort.Values) { for (int i = 0; i < listSort.Count; i++) { - if (dic.ContainsKey(listSort[i]) == true) + if (dic.ContainsKey(listSort[i]) == true && listCheck.Contains(listSort[i]) == false) { + listCheck.Add(listSort[i]); dic[listSort[i]].Sort((obj1, obj2) => { if (obj1.DeviceEpoint > obj2.DeviceEpoint) -- Gitblit v1.8.0