From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 九月 2020 15:22:09 +0800
Subject: [PATCH] 2020-09-01

---
 HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditFunctionPageBLL.cs |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditFunctionPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditFunctionPageBLL.cs
index ca86ed6..6675717 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditFunctionPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditFunctionPageBLL.cs
@@ -31,7 +31,7 @@
                 btnAllocated.TextSize = CSS_FontSize.TextFontSize;
                 btnChoosedRoom.Visible = false;
                 btnChooseRoomIcon.Visible = false;
-                LoadFunctionListRow(true);
+                LoadFunctionListRow(unallocatedList);
             };
             btnAllocated.MouseUpEventHandler = (sender, e) => {
                 btnUnallocated.IsSelected = false;
@@ -42,7 +42,7 @@
                 btnUnallocated.TextSize = CSS_FontSize.TextFontSize;
                 btnChoosedRoom.Visible = true;
                 btnChooseRoomIcon.Visible = true;
-                LoadFunctionListRow(false);
+                LoadFunctionListRow(allocatedList);
             };
         }
 
@@ -55,22 +55,22 @@
                 btn.IsSelected = !btn.IsSelected;
                 if (btn.IsSelected)
                 {
-                    function.roomIdList.Add(roomId);
+                    function.roomIdList.Add(room.sid);
                 }
                 else
                 {
-                    function.roomIdList.Remove(roomId);
+                    function.roomIdList.Remove(room.sid);
                 }
             };
             btn.MouseUpEventHandler = (sender, e) => {
                 btn.IsSelected = !btn.IsSelected;
                 if (btn.IsSelected)
                 {
-                    function.roomIdList.Add(roomId);
+                    function.roomIdList.Add(room.sid);
                 }
                 else
                 {
-                    function.roomIdList.Remove(roomId);
+                    function.roomIdList.Remove(room.sid);
                 }
             };
         }
@@ -104,7 +104,7 @@
                 }
                 btn.IsSelected = true;
                 showedFunctionRoomId = btn.Tag.ToString() == "0" ? null : btn.Tag.ToString();
-                LoadFunctionListRow(false);
+                LoadFunctionListRow(allocatedList.FindAll((obj) => obj.roomIdList.Contains(showedFunctionRoomId)));
                 btnChoosedRoom.Text = chooseRoomName;
                 dialog.Close();
             };
@@ -116,8 +116,8 @@
         void LoadEvent_SaveRoomData()
         {
             btnConfrim.MouseUpEventHandler = (sender, e) => {
-                DB_ResidenceData.residenceData.SaveResidenceData();
-                DB_ResidenceData.residenceData.rooms.Find((obj) => obj.sid == roomId).RefreshFunctions();
+                room.SaveRoomData();
+                room.GetRoomFunctions(true);
                 bodyView.RemoveFromParent();
             };
         }

--
Gitblit v1.8.0