From 505effa88b17ce8c3c7ac5403b76d9e5d0cfc2a5 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 28 十月 2024 11:58:31 +0800
Subject: [PATCH] 谷歌版本问题修复
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 5158ff5..902fe8c 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -1,5 +1,6 @@
锘�
using System;
+using System.Collections.Generic;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -35,6 +36,12 @@
#endregion
+ public override void RemoveFromParent()
+ {
+ base.RemoveFromParent();
+ bodyView = null;
+ }
+
/// <summary>
///
/// </summary>
@@ -66,7 +73,8 @@
{
bodyView.RemoveAll();
LoadPage();
- }catch (Exception ex)
+ }
+ catch (Exception ex)
{
MainPage.Log($"RoomPage ReloadPage error :\r\n {ex.Message}");
}
@@ -89,19 +97,17 @@
var list = room.GetRoomFunctions(false);
+
foreach (var function in list)
{
if (MainPage.RoomNotSupportFunctionList.Contains(function.spk))
{
continue;
}
-#if DEBUG
- //throw new ArgumentNullException();
-#endif
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)
{
@@ -119,9 +125,10 @@
}
else
{
+
var functionDiv = new FunctionControlZone(function, () =>
{
- this.ReLoadPage();
+ this.ReLoadPage(); //鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I
})
{
Gravity = Gravity.CenterHorizontal,
--
Gitblit v1.8.0