上传合并后的代码

黄学彪

2020-04-28 e22fdb94322e6cec38e5e4a9aec13d431a133fde

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

@@ -227,7 +227,8 @@
        /// 增加房间

        /// </summary>

        /// <param name="room">Room.</param>

        public void AddRoom(Room room)

        /// <param name="rorefreshRoomViewom">是否刷新房间视图列表界面</param>

        public void AddRoom(Room room, bool refreshRoomView = true)

        {

            if (Global.IsExistsByHomeId(room.FileName) == true

                || Config.Instance.Home.ListRooms.Contains(room.Id) == true)

@@ -242,8 +243,11 @@
            room.Save();

            //备份

            HdlAutoBackupLogic.AddOrEditorFile(room.FileName);

            //刷新房间视图列表

            this.RefreshRoomListView();

            if (refreshRoomView == true)

            {

                //刷新房间视图列表

                this.RefreshRoomListView();

            }

        }



        #endregion

@@ -924,6 +928,10 @@
        /// <returns></returns>

        public List<Room> GetFloorSortRoom(string i_floorKeys, bool getShard = true)

        {

            if (i_floorKeys == null)

            {

                i_floorKeys = string.Empty;

            }

            Dictionary<string, List<string>> dicAllSort = new Dictionary<string, List<string>>();

            //读取房间顺序

            string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.RoomSortFile);