上传代码

黄学彪

2020-05-13 2be70a32d2a8c517bd9868fb60913fcc843e66fe

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

@@ -123,7 +123,14 @@
                }

            }

            //检测楼层数据的合法性

            this.CheckFloorData(listRoomFile);

            if (UserCenterResourse.UserInfo.AuthorityNo == 3)

            {

                this.CheckMemberFloorData(listRoomFile);

            }

            else

            {

                this.CheckAdminFloorData(listRoomFile);

            }



            homeTemp.Save(false);

            InitAllRoom();

@@ -136,7 +143,7 @@
        {

            Application.RunOnMainThread(() =>

            {

                MainPage.ListRoomViewFrom.Instance?.ShowForm();

                MainPage.ListRoomViewFrom.Instance?.RefreshListRoom();

            });

        }



@@ -144,8 +151,12 @@
        /// 检测楼层数据的合法性

        /// </summary>

        /// <param name="listRoomFile"></param>

        private void CheckFloorData(List<string> listRoomFile)

        private void CheckAdminFloorData(List<string> listRoomFile)

        {

            //没有楼层,则无需处理

            if (Config.Instance.Home.FloorDics.Count == 0) { return; }



            //主人或者管理员的话,就检测是否存在未分配楼层的房间

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

            {

                try

@@ -165,6 +176,49 @@
            }

        }



        /// <summary>

        /// 检测楼层数据的合法性

        /// </summary>

        /// <param name="listRoomFile"></param>

        private void CheckMemberFloorData(List<string> listRoomFile)

        {

            //没有楼层,则无需处理

            if (Config.Instance.Home.FloorDics.Count == 0) { return; }



            //成员的话,就检测是否存在没有房间的楼层

            var listEsixtFloor = new List<string>();

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

            {

                try

                {

                    var byteData = Global.ReadFileByHomeId(listRoomFile[i]);

                    string valueData = System.Text.Encoding.UTF8.GetString(byteData);

                    var roomTemp = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.Room>(valueData);

                    if (roomTemp.FloorId != string.Empty && listEsixtFloor.Contains(roomTemp.FloorId) == false)

                    {

                        //收集楼层

                        listEsixtFloor.Add(roomTemp.FloorId);

                    }

                }

                catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }

            }

            var listDeleteId = new List<string>();

            foreach (var flootId in Config.Instance.Home.FloorDics.Keys)

            {

                if (listEsixtFloor.Contains(flootId) == false)

                {

                    //如果这个id不存在于任何房间的话,收集它

                    listDeleteId.Add(flootId);

                }

            }

            foreach (var deleteId in listDeleteId)

            {

                //删除这个id

                Config.Instance.Home.FloorDics.Remove(deleteId);

            }

            Config.Instance.Home.Save(false);

        }



        #endregion



        #region ■ 添加房间___________________________

@@ -173,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)

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

            //备份

            HdlAutoBackupLogic.AddOrEditorFile(room.FileName);

            //刷新房间视图列表

            this.RefreshRoomListView();

            if (refreshRoomView == true)

            {

                //刷新房间视图列表

                this.RefreshRoomListView();

            }

        }



        #endregion

@@ -524,6 +582,8 @@
            {

                //从原来的房间移除设备

                this.DeleteDevice(device);

                //设备改变房间的话,主页需要重新刷新

                UserView.UserPage.Instance.RefreshForm = true;

                return;

            }

            //房间是否修改

@@ -540,6 +600,8 @@
            {

                this.AddDevice(room, device, saveRealRoom);

            }

            //设备改变房间的话,主页需要重新刷新

            UserView.UserPage.Instance.RefreshForm = true;

        }



        /// <summary>

@@ -870,6 +932,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);