From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs
index 6675717..375c8a3 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs
@@ -55,22 +55,37 @@
btn.IsSelected = !btn.IsSelected;
if (btn.IsSelected)
{
- function.roomIdList.Add(room.sid);
+ function.roomIds.Add(room.uid);
}
else
{
- function.roomIdList.Remove(room.sid);
+ function.roomIds.Remove(room.uid);
+ }
+ if (changeList.Contains(function))
+ {
+ changeList.Remove(function);
+ }else
+ {
+ changeList.Add(function);
}
};
btn.MouseUpEventHandler = (sender, e) => {
btn.IsSelected = !btn.IsSelected;
if (btn.IsSelected)
{
- function.roomIdList.Add(room.sid);
+ function.roomIds.Add(room.uid);
}
else
{
- function.roomIdList.Remove(room.sid);
+ function.roomIds.Remove(room.uid);
+ }
+ if (changeList.Contains(function))
+ {
+ changeList.Remove(function);
+ }
+ else
+ {
+ changeList.Add(function);
}
};
}
@@ -104,7 +119,7 @@
}
btn.IsSelected = true;
showedFunctionRoomId = btn.Tag.ToString() == "0" ? null : btn.Tag.ToString();
- LoadFunctionListRow(allocatedList.FindAll((obj) => obj.roomIdList.Contains(showedFunctionRoomId)));
+ LoadFunctionListRow(allocatedList.FindAll((obj) => obj.roomIds.Contains(showedFunctionRoomId)));
btnChoosedRoom.Text = chooseRoomName;
dialog.Close();
};
@@ -116,6 +131,10 @@
void LoadEvent_SaveRoomData()
{
btnConfrim.MouseUpEventHandler = (sender, e) => {
+ foreach(var f in changeList)
+ {
+ f.SaveFunctionData();
+ }
room.SaveRoomData();
room.GetRoomFunctions(true);
bodyView.RemoveFromParent();
--
Gitblit v1.8.0