From af4101b1d8461331bc3163b738fc75d4bf67c85c Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期二, 28 七月 2020 17:47:44 +0800 Subject: [PATCH] 2020-07-28-1 --- HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs index 4881199..5952a8d 100644 --- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs +++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs @@ -41,12 +41,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