From aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 21:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
old mode 100644
new mode 100755
index 86441aa..d497c19
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
@@ -46,20 +46,20 @@
}
}
}
- function.roomIdList.Clear();
- foreach (var room in Entity.DB_ResidenceData.rooms)
+ function.roomIds.Clear();
+ foreach (var room in Entity.SpatialInfo.CurrentSpatial.RoomList)
{
if (btnChooseAll.IsSelected)
{
- function.roomIdList.Add(room.sid);
+ function.roomIds.Add(room.roomId);
}
else
{
- function.roomIdList.Remove(room.sid);
+ 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.roomIdList.Add(room.sid);
+ function.roomIds.Add(room.roomId);
room.AddRoomFunction(function);
}
else
{
- function.roomIdList.Remove(room.sid);
+ function.roomIds.Remove(room.roomId);
room.RemoveRoomFunction(function);
}
- function.SaveFunctionData();
- if (function.roomIdList.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