From 301d3f15ba03ff942c029bd4c0b1ff544f7cfede Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 30 十二月 2020 11:19:48 +0800 Subject: [PATCH] 2020-12-30 1.解决RGB灯,色盘ColorPicker部分安卓手机,刷新图片时会变小问题 --- HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs index d8b5df8..62d6a5a 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs @@ -1,8 +1,12 @@ 锘縰sing System; +using System.Collections.Generic; using Shared; namespace HDL_ON.UI { + /// <summary> + /// 鍔熻兘鍒嗛厤鎴块棿BLL + /// </summary> public partial class ChooseRoomPage { /// <summary> @@ -43,19 +47,20 @@ } } } - function.roomIdList.Clear(); - foreach (var room in Entity.DB_ResidenceData.residenceData.rooms) + function.roomIds.Clear(); + if (btnChooseAll.IsSelected) { - if (btnChooseAll.IsSelected) + foreach (var room in Entity.SpatialInfo.CurrentSpatial.RoomList) { - function.roomIdList.Add(room.sid); - } - else - { - function.roomIdList.Remove(room.sid); + if (btnChooseAll.IsSelected) + { + function.roomIds.Add(room.roomId); + } } } - Entity.DB_ResidenceData.residenceData.SaveResidenceData(); + + function.UpdataRoomIds(); + Entity.SpatialInfo.CurrentSpatial.InitRoomListFunctions(); }; } @@ -66,16 +71,16 @@ { if (isAdd) { - function.roomIdList.Add(room.sid); - room.functionData.Add(function); + function.roomIds.Add(room.roomId); + room.AddRoomFunction(function); } else { - function.roomIdList.Remove(room.sid); - room.functionData.Remove(function); + function.roomIds.Remove(room.roomId); + room.RemoveRoomFunction(function); } - Entity.DB_ResidenceData.residenceData.SaveResidenceData(); - if (function.roomIdList.Count == Entity.DB_ResidenceData.residenceData.rooms.Count) + function.UpdataRoomIds(); + if (function.roomIds.Count == Entity.SpatialInfo.CurrentSpatial.RoomList.Count) { btnChooseAll.IsSelected = true; } -- Gitblit v1.8.0