From 263401d40b2d9d2c1b36a24f33d45c5cb7192518 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期三, 23 十二月 2020 15:51:54 +0800 Subject: [PATCH] 20201223-6 --- HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs index 194cb18..d497c19 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs @@ -47,19 +47,19 @@ } } function.roomIds.Clear(); - foreach (var room in Entity.DB_ResidenceData.Rooms) + foreach (var room in Entity.SpatialInfo.CurrentSpatial.RoomList) { if (btnChooseAll.IsSelected) { - function.roomIds.Add(room.uid); + function.roomIds.Add(room.roomId); } else { - function.roomIds.Remove(room.uid); + function.roomIds.Remove(room.roomId); } - function.SaveFunctionData(); + function.SaveFunctionData(true); } - Entity.DB_ResidenceData.InitRoomFunction(); + Entity.SpatialInfo.CurrentSpatial.InitRoomFunction(); }; } @@ -70,16 +70,16 @@ { if (isAdd) { - function.roomIds.Add(room.uid); + function.roomIds.Add(room.roomId); room.AddRoomFunction(function); } else { - function.roomIds.Remove(room.uid); + function.roomIds.Remove(room.roomId); room.RemoveRoomFunction(function); } - function.SaveFunctionData(); - if (function.roomIds.Count == Entity.DB_ResidenceData.Rooms.Count) + function.SaveFunctionData(true); + if (function.roomIds.Count == Entity.SpatialInfo.CurrentSpatial.RoomList.Count) { btnChooseAll.IsSelected = true; } -- Gitblit v1.8.0