完全合并了Wjc，Xm 的 代码

黄学彪

2019-10-24 31497bb69602433d94c8a28ea01c3ee3c7cc8576

 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)