合并代码

xm

2020-04-22 dfa6733793434bdcfd394f978ae72f1628b2260f

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

@@ -1019,6 +1019,8 @@
            {

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

            }



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

            {

                if (listFloorSort != null)
@@ -1029,6 +1031,7 @@
                        listFloorSort.Add(keys);
                    }
                }

            }



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

@@ -1042,7 +1045,6 @@
                    }
                }
            }

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

            return dic;