From 9dce5facf5c6aa29928880a0fa2fbfc7366a6dad Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 08 十二月 2020 15:00:57 +0800
Subject: [PATCH] 2020-12-08 1.修改回动态切换域名,用户相关接口使用用户域名,住宅相关接口用住宅的域名。

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

diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
index 86441aa..cb64da5 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.rooms)
+                function.roomIds.Clear();
+                foreach (var room in Entity.DB_ResidenceData.residenceData.Rooms)
                 {
                     if (btnChooseAll.IsSelected)
                     {
-                        function.roomIdList.Add(room.sid);
+                        function.roomIds.Add(room.uid);
                     }
                     else
                     {
-                        function.roomIdList.Remove(room.sid);
+                        function.roomIds.Remove(room.uid);
                     }
                     function.SaveFunctionData();
                 }
-                Entity.DB_ResidenceData.InitRoomFunction();
+                Entity.SpatialInfo.CurrentSpatial.InitRoomFunction();
             };
         }
 
@@ -70,16 +70,16 @@
         {
             if (isAdd)
             {
-                function.roomIdList.Add(room.sid);
+                function.roomIds.Add(room.uid);
                 room.AddRoomFunction(function);
             }
             else
             {
-                function.roomIdList.Remove(room.sid);
+                function.roomIds.Remove(room.uid);
                 room.RemoveRoomFunction(function);
             }
             function.SaveFunctionData();
-            if (function.roomIdList.Count == Entity.DB_ResidenceData.rooms.Count)
+            if (function.roomIds.Count == Entity.DB_ResidenceData.residenceData.Rooms.Count)
             {
                 btnChooseAll.IsSelected = true;
             }

--
Gitblit v1.8.0