From 4e7c1dd0767d551ec3194ead9f3de0a219a802c3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 25 九月 2023 17:24:37 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr-2.1
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index d33492a..7bbf394 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -110,7 +110,7 @@
functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
- if (function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
+ if (function.spk == SPK.LightRGBW || function.spk == SPK.LightCCT || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
var functionDiv = new FunctionControlZone(function, null)
{
@@ -128,9 +128,10 @@
}
else
{
+
var functionDiv = new FunctionControlZone(function, () =>
{
- this.ReLoadPage();
+ this.ReLoadPage(); //鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I
})
{
Gravity = Gravity.CenterHorizontal,
--
Gitblit v1.8.0