From 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 17:20:01 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
index 3e9af2d..68f4547 100644
--- 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.residenceData.rooms)
+ function.roomIds.Clear();
+ foreach (var room in Entity.DB_ResidenceData.rooms)
{
if (btnChooseAll.IsSelected)
{
- function.roomIdList.Add(room.sid);
+ function.roomIds.Add(room.sid);
}
else
{
- function.roomIdList.Remove(room.sid);
+ function.roomIds.Remove(room.sid);
}
+ function.SaveFunctionData();
}
Entity.DB_ResidenceData.InitRoomFunction();
- Entity.DB_ResidenceData.residenceData.SaveResidenceData();
};
}
@@ -70,16 +70,16 @@
{
if (isAdd)
{
- function.roomIdList.Add(room.sid);
- room.functions.Add(function);
+ function.roomIds.Add(room.sid);
+ room.AddRoomFunction(function);
}
else
{
- function.roomIdList.Remove(room.sid);
- room.functions.Remove(function);
+ function.roomIds.Remove(room.sid);
+ room.RemoveRoomFunction(function);
}
- Entity.DB_ResidenceData.residenceData.SaveResidenceData();
- if (function.roomIdList.Count == Entity.DB_ResidenceData.residenceData.rooms.Count)
+ function.SaveFunctionData();
+ if (function.roomIds.Count == Entity.DB_ResidenceData.rooms.Count)
{
btnChooseAll.IsSelected = true;
}
--
Gitblit v1.8.0