首次合并了全部的代码

黄学彪

2019-10-15 2bf5ec775cb57d8015bee58c745a1e48081ff1b1

 ZigbeeApp/Shared/Common/Device.cs

@@ -85,7 +85,7 @@
        /// </summary>

        private Dictionary<string, HashSet<int>> dicDeviceEpoint = new Dictionary<string, HashSet<int>>();

        /// <summary>

        /// 设备Mac顺序

        /// 设备Mac顺序(里面是Mac地址)

        /// </summary>

        private Dictionary<string, List<string>> dicDeviceSort = null;

        /// <summary>

@@ -1563,10 +1563,14 @@
        /// <returns></returns>

        public List<CommonDevice> SortDevice(List<CommonDevice> listDevice)

        {

            var dic = new Dictionary<string, CommonDevice>();

            var dic = new Dictionary<string, List<CommonDevice>>();

            for (int i = 0; i < listDevice.Count; i++)

            {

                dic[(this.GetDeviceMainKeys(listDevice[i]))] = listDevice[i];

                if (dic.ContainsKey(listDevice[i].DeviceAddr) == false)

                {

                    dic[listDevice[i].DeviceAddr] = new List<CommonDevice>();

                }

                dic[listDevice[i].DeviceAddr].Add(listDevice[i]);

            }

            var list = new List<CommonDevice>();

            foreach (var listSort in this.dicDeviceSort.Values)

@@ -1575,7 +1579,15 @@
                {

                    if (dic.ContainsKey(listSort[i]) == true)

                    {

                        list.Add(dic[listSort[i]]);

                        dic[listSort[i]].Sort((obj1, obj2) =>

                        {

                            if (obj1.DeviceEpoint > obj2.DeviceEpoint)

                            {

                                return 1;

                            }

                            return -1;

                        });

                        list.AddRange(dic[listSort[i]]);

                    }

                }

            }