From e35967bbb7a3a678752283c64fe2a496e2f3b702 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 03 八月 2023 23:37:23 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' of http://59.41.255.150:6688/r/~wxr/OnPro into wxr-2.1
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 9d374a2..83d4b24 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -36,6 +36,12 @@
#endregion
+ public override void RemoveFromParent()
+ {
+ base.RemoveFromParent();
+ bodyView = null;
+ }
+
/// <summary>
///
/// </summary>
@@ -67,7 +73,8 @@
{
bodyView.RemoveAll();
LoadPage();
- }catch (Exception ex)
+ }
+ catch (Exception ex)
{
MainPage.Log($"RoomPage ReloadPage error :\r\n {ex.Message}");
}
@@ -103,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)
{
--
Gitblit v1.8.0