From 94bed925cf453e148bc5a7556a8a86e0bcb9ad6c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 24 三月 2021 14:11:16 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr

---
 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