From 014abc547ffd1a9f23c58fd7a471dffc5933fdd3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 14:27:56 +0800
Subject: [PATCH] Merge branch 'master' into NewFilePath
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs
index 8006c70..8bb99ac 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs
@@ -156,7 +156,7 @@
};
bodyView.AddChidren(functionListView);
- foreach (var function in DB_ResidenceData.functionList.GetAllFunction())
+ foreach (var function in FunctionList.List.GetDeviceFunctionList())
{
function.roomIds.Remove(null);
if (function.roomIds.Count > 0 )
@@ -414,7 +414,7 @@
Height = Application.GetRealWidth(1),
BackgroundColor = CSS_Color.DividingLineColor,
});
- foreach (var tempRoom in DB_ResidenceData.residenceData.Rooms)
+ foreach (var tempRoom in SpatialInfo.CurrentSpatial.RoomList)
{
Button btnRoom = new Button()
--
Gitblit v1.8.0