请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

File was renamed from ZigbeeApp20200414/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
@@ -1021,11 +1021,14 @@
            }

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

            {

                if (listFloorSort.Contains(keys) == false)

                {

                    //新添加的楼层

                    listFloorSort.Add(keys);

                }

                if (listFloorSort != null)
                {
                    if (listFloorSort.Contains(keys) == false)
                    {
                        //新添加的楼层
                        listFloorSort.Add(keys);
                    }
                }
            }



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

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


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