From 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 八月 2020 17:06:36 +0800
Subject: [PATCH] 20200813
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 5de0c0e..9ee72a0 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()
{
@@ -43,6 +48,11 @@
foreach (var function in room.functions)
{
+ 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