From 5da99fed2eb0d08b6338064da5f998891252c7b8 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期一, 18 五月 2020 16:39:59 +0800 Subject: [PATCH] 2020-05-18-2 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs | 139 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 122 insertions(+), 17 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs index a44eb08..8daca3a 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs +++ b/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(() => { - 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 @@ -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 @@ -307,10 +365,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 +386,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 +577,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 +757,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 +837,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 +855,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,13 +921,17 @@ #region 鈻� 妤煎眰鍜屾埧闂撮『搴忕浉鍏砡________________ /// <summary> - /// 鏍规嵁妤煎眰鐨勪富閿幏鍙栨帓搴忓悗鐨勬埧闂村垪琛� + /// 鏍规嵁妤煎眰鐨勪富閿幏鍙栨帓搴忓悗鐨勬埧闂村垪琛�(鏀寔鏃犳ゼ灞傛ā寮�) /// </summary> /// <param name="i_floorKeys">妤煎眰鐨勪富閿�</param> /// <param name="getShard">鍒嗕韩鐨勬埧闂存槸鍚︿篃鑾峰彇</param> /// <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); @@ -854,9 +954,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) @@ -993,7 +1098,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); //娣诲姞鍒癶ouse 鎴块棿璺緞鍒楄〃 var currentHome = Config.Instance.Home; -- Gitblit v1.8.0