From af1cb3ecd0f4b0589e00b28f7f9edccf39e6e12b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 10 九月 2020 16:15:11 +0800
Subject: [PATCH] 202009101
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 5de0c0e..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,8 +46,13 @@
};
bodyView.AddChidren(functionListView);
- foreach (var function in room.functions)
+ foreach (var function in room.GetRoomFunctions(false))
{
+ if (function.functionCategory == FunctionCategory.Sensor)
+ {
+ continue;
+ }
+
functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
--
Gitblit v1.8.0