From 3add06f19c3c68289ca58fb61d15dfa059c5c8f5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 22 七月 2021 09:21:07 +0800
Subject: [PATCH] Merge branch 'wxr7-ez' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into wxr7-ez

---
 HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
index 62d6a5a..1e56bf0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
@@ -22,7 +22,7 @@
         /// </summary>
         void LoadMethod_AllElection()
         {
-            btnChooseAll.MouseUpEventHandler += (sender, e) =>
+            btnAllRoomText.MouseUpEventHandler += (sender, e) =>
             {
                 btnChooseAll.IsSelected = !btnChooseAll.IsSelected;
 
@@ -72,12 +72,12 @@
             if (isAdd)
             {
                 function.roomIds.Add(room.roomId);
-                room.AddRoomFunction(function);
+                //room.AddRoomFunction(function);
             }
             else
             {
                 function.roomIds.Remove(room.roomId);
-                room.RemoveRoomFunction(function);
+                //room.RemoveRoomFunction(function);
             }
             function.UpdataRoomIds();
             if (function.roomIds.Count == Entity.SpatialInfo.CurrentSpatial.RoomList.Count)

--
Gitblit v1.8.0