From f77a3add1e7ab266e473da9128bbe5758ba3a890 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 20 十二月 2020 19:29:03 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 cb64da5..d497c19
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
@@ -47,17 +47,17 @@
}
}
function.roomIds.Clear();
- foreach (var room in Entity.DB_ResidenceData.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.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.residenceData.Rooms.Count)
+ function.SaveFunctionData(true);
+ if (function.roomIds.Count == Entity.SpatialInfo.CurrentSpatial.RoomList.Count)
{
btnChooseAll.IsSelected = true;
}
--
Gitblit v1.8.0