From 62d77d3bb8e7215d9da9ecf6f5aeda0b69f805f8 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 08 十二月 2020 18:57:15 +0800
Subject: [PATCH] 20201208
---
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 68f4547..0b17f56 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.DB_ResidenceData.residenceData.Rooms)
{
if (btnChooseAll.IsSelected)
{
- function.roomIds.Add(room.sid);
+ function.roomIds.Add(room.uid);
}
else
{
- function.roomIds.Remove(room.sid);
+ function.roomIds.Remove(room.uid);
}
- function.SaveFunctionData();
+ function.SaveFunctionData(true);
}
- Entity.DB_ResidenceData.InitRoomFunction();
+ Entity.SpatialInfo.CurrentSpatial.InitRoomFunction();
};
}
@@ -70,16 +70,16 @@
{
if (isAdd)
{
- function.roomIds.Add(room.sid);
+ function.roomIds.Add(room.uid);
room.AddRoomFunction(function);
}
else
{
- function.roomIds.Remove(room.sid);
+ function.roomIds.Remove(room.uid);
room.RemoveRoomFunction(function);
}
- function.SaveFunctionData();
- if (function.roomIds.Count == Entity.DB_ResidenceData.rooms.Count)
+ function.SaveFunctionData(true);
+ if (function.roomIds.Count == Entity.DB_ResidenceData.residenceData.Rooms.Count)
{
btnChooseAll.IsSelected = true;
}
--
Gitblit v1.8.0