合并代码

xm

2020-04-22 dfa6733793434bdcfd394f978ae72f1628b2260f

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs

@@ -1018,9 +1018,11 @@
            if (strData != null)

            {

                listFloorSort = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(strData);

            }

            foreach (string keys in Common.Config.Instance.Home.FloorDics.Keys)

            {

            }


            foreach (string keys in Common.Config.Instance.Home.FloorDics.Keys)
            {
                if (listFloorSort != null)
                {
                    if (listFloorSort.Contains(keys) == false)
@@ -1029,9 +1031,10 @@
                        listFloorSort.Add(keys);
                    }
                }
            }



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


            }

            var dic = new Dictionary<string, string>();
            if (listFloorSort != null)
            {
                for (int i = 0; i < listFloorSort.Count; i++)
@@ -1042,7 +1045,6 @@
                    }
                }
            }

            //保存顺序
            UserCenterLogic.SaveFileContent(fullName, listFloorSort);

            return dic;