From 2bbb1b72dbce5cf9bd4ac4a5b7488e3f18eaf929 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 19 十二月 2020 18:37:38 +0800
Subject: [PATCH] 2020-12-19 1.IOS和Android网络切换，远程和本地控制切换优化。 2.IOS和Android后台回到前台，搜索网关，远程和本地控制切换优化.
---
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
old mode 100644
new mode 100755
index d7f64c0..d497c19
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs
@@ -47,7 +47,7 @@
}
}
function.roomIds.Clear();
- foreach (var room in Entity.DB_ResidenceData.residenceData.Rooms)
+ foreach (var room in Entity.SpatialInfo.CurrentSpatial.RoomList)
{
if (btnChooseAll.IsSelected)
{
@@ -79,7 +79,7 @@
room.RemoveRoomFunction(function);
}
function.SaveFunctionData(true);
- if (function.roomIds.Count == Entity.DB_ResidenceData.residenceData.Rooms.Count)
+ if (function.roomIds.Count == Entity.SpatialInfo.CurrentSpatial.RoomList.Count)
{
btnChooseAll.IsSelected = true;
}
--
Gitblit v1.8.0