From ec8c4e511c84c33bc6475834c29f774c4c4af74d Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 05 八月 2020 16:22:40 +0800
Subject: [PATCH] 2020-08-05-1
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 4881199..38b0579 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -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,12 +46,16 @@
};
bodyView.AddChidren(functionListView);
-
- foreach (var function in room.functionData)
+ foreach (var function in room.functions)
{
+ if (function.functionCategory == FunctionCategory.Sensor)
+ {
+ continue;
+ }
+
functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
- if (function.functionType == "RGB" || function.functionType == "Dimmer")
+ if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
{
var functionDiv = new FunctionControlZone(function)
{
--
Gitblit v1.8.0