From e6a26ee148587327478d9a82624a820c907b6e16 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 04 十一月 2020 14:58:15 +0800
Subject: [PATCH] 20201104
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 5952a8d..b8f4460 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -20,7 +20,7 @@
#endregion
#region
- Room room;
+ static Room room;
#endregion
public RoomPage(Room r)
@@ -31,8 +31,13 @@
public void LoadPage()
{
+ Action skipAction = () =>
+ {
+ LoadEvent_SkipEditRoomPage();
+ };
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView,room.name).LoadTopView();
+
+ new TopViewDiv(bodyView,room.name).LoadTopView(room ,skipAction);
functionListView = new VerticalScrolViewLayout()
{
@@ -41,7 +46,7 @@
};
bodyView.AddChidren(functionListView);
- foreach (var function in room.functions)
+ foreach (var function in room.GetRoomFunctions(false))
{
if (function.functionCategory == FunctionCategory.Sensor)
{
--
Gitblit v1.8.0