From 0c0a436a30bc24d4cd470eea7ba980ee418018ff Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 四月 2021 16:36:41 +0800
Subject: [PATCH] Merge branch 'CJL' into temp-wxr
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 09ee8a8..bcf7f24 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -77,14 +77,14 @@
foreach (var function in room.GetRoomFunctions(false))
{
- if (function.functionCategory == FunctionCategory.Sensor)
+ if (function.Spk_Prefix == FunctionCategory.Sensor)
{
continue;
}
functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
- if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
+ if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
var functionDiv = new FunctionControlZone(function)
{
--
Gitblit v1.8.0