派生自 ~xm/HomeApp
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.csold mode 100755 new mode 100644
@@ -75,8 +75,8 @@ //清空本地缓存 this.dicRooms.Clear(); //检测我的喜爱这个房间对象 this.CheckLoveRoom(); this.CheckLoveRoom(); foreach (var roomId in Config.Instance.Home.ListRooms) { //从文件里面获取房间对象 @@ -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(() => { Phone.Device.Room.RoomManagement.Instance.Show(); MainPage.ListRoomViewFrom.Instance?.ShowForm(); }); } @@ -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 @@ -163,6 +174,49 @@ } catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); } } } /// <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 @@ -307,10 +361,19 @@ /// </summary> /// <returns>房间名</returns> /// <param name="device">设备对象</param> /// <param name="append">在楼层和房间名字的中间添加的字符(仅限有楼层的时候有效)</param> public string GetRoomNameByDevice(CommonDevice device, string append = " ") public string GetRoomNameByDevice(CommonDevice device) { var room = this.GetRoomByDevice(device); return this.GetFloorRoomName(room); } /// <summary> /// 获取房间名字(楼层+房间名) /// </summary> /// <returns>房间名</returns> /// <param name="room">房间对象</param> public string GetFloorRoomName(Room room) { if (room == null) { //未分配区域 @@ -319,7 +382,7 @@ if (Config.Instance.Home.FloorDics.ContainsKey(room.FloorId) == true) { //(楼层+房间名) return Config.Instance.Home.FloorDics[room.FloorId] + append + room.Name; return Config.Instance.Home.FloorDics[room.FloorId] + " " + room.Name; } return room.Name; } @@ -510,6 +573,13 @@ /// <param name="saveRealRoom">是否修改真实物理设备的房间,不出意外,这个值默认为true即可</param> public void ChangedRoom(CommonDevice device, string roomId, bool saveRealRoom = true) { //选择的是未分配 if (roomId == string.Empty) { //从原来的房间移除设备 this.DeleteDevice(device); return; } //房间是否修改 if (this.IsRoomChanged(device, roomId) == false) { @@ -683,12 +753,28 @@ /// <returns></returns> public List<CommonDevice> GetRoomListDevice(Room i_room) { var listDevice = new List<CommonDevice>(); var dicSort = new Dictionary<string, List<int>>(); foreach (var mainKeys in i_room.ListDevice) { var device = LocalDevice.Current.GetDevice(mainKeys); if (device != null) { if (dicSort.ContainsKey(device.DeviceAddr) == false) { dicSort[device.DeviceAddr] = new List<int>(); } dicSort[device.DeviceAddr].Add(device.DeviceEpoint); } } var listDevice = new List<CommonDevice>(); foreach (var strMac in dicSort.Keys) { var listEpont = dicSort[strMac]; //排序 listEpont.Sort(); for (int i = 0; i < listEpont.Count; i++) { var device = LocalDevice.Current.GetDevice(strMac, listEpont[i]); listDevice.Add(device); } } @@ -747,6 +833,11 @@ var listEsxit = new HashSet<string>(); foreach (var room in this.dicRooms.Values) { if (room.IsLove == true) { //不包含收藏房间 continue; } foreach (string mainkeys in room.ListDevice) { if (listEsxit.Contains(mainkeys) == false) @@ -760,15 +851,16 @@ var commonDeviceList = LocalDevice.Current.listAllDevice; foreach (var device in commonDeviceList) { //判断该设备能否显示在主页 if (LocalDevice.Current.CanShowInHomeHomeMainPage(device) == false) { continue; } string mainkeys = LocalDevice.Current.GetDeviceMainKeys(device); if (listEsxit.Contains(mainkeys) == false) { listDevice.Add(device); } } if (listDevice.Count == 0) { return null; } return listDevice; } @@ -825,7 +917,7 @@ #region ■ 楼层和房间顺序相关_________________ /// <summary> /// 根据楼层的主键获取排序后的房间列表 /// 根据楼层的主键获取排序后的房间列表(支持无楼层模式) /// </summary> /// <param name="i_floorKeys">楼层的主键</param> /// <param name="getShard">分享的房间是否也获取</param> @@ -854,9 +946,14 @@ var dicRoom = new Dictionary<string, Common.Room>(); foreach (var room in this.dicRooms.Values) { if (room.FloorId != i_floorKeys || room.IsLove == true) if (room.FloorId != i_floorKeys && i_floorKeys != string.Empty) { //不是同一个楼层 continue; } if (room.IsLove == true) { //不要我的喜爱 continue; } if (listRoomSort.Contains(room.Id) == false) @@ -924,23 +1021,29 @@ } 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>(); for (int i = 0; i < listFloorSort.Count; i++) { if (Config.Instance.Home.FloorDics.ContainsKey(listFloorSort[i]) == true) { dic[listFloorSort[i]] = Config.Instance.Home.FloorDics[listFloorSort[i]]; } } //保存顺序 if (listFloorSort != null) { for (int i = 0; i < listFloorSort.Count; i++) { if (Config.Instance.Home.FloorDics.ContainsKey(listFloorSort[i]) == true) { dic[listFloorSort[i]] = Config.Instance.Home.FloorDics[listFloorSort[i]]; } } } //保存顺序 UserCenterLogic.SaveFileContent(fullName, listFloorSort); return dic; } @@ -993,7 +1096,7 @@ if (Config.Instance.Home.ListRooms.Contains("Favorite") == false) { //默认添加喜爱的房间--禁止修改房间名 var love = new Room { Name = Language.StringByID(R.MyInternationalizationString.Favorite), BackgroundImage = "RoomIcon/0.JPG", Id = "Favorite" }; var love = new Room { Name = Language.StringByID(R.MyInternationalizationString.Favorite), BackgroundImage = "RoomIcon/0.jpg", Id = "Favorite" }; love.Save(false); //添加到house 房间路径列表 var currentHome = Config.Instance.Home;
