From 4fef29b9ab9f2632f15a0d45005f92d91de5d4e5 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期四, 27 七月 2023 14:26:59 +0800
Subject: [PATCH] feature 萤石sdk更新
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index f19a9d6..9d374a2 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;
@@ -62,8 +63,14 @@
{
if (bodyView != null)
{
- bodyView.RemoveAll();
- LoadPage();
+ try
+ {
+ bodyView.RemoveAll();
+ LoadPage();
+ }catch (Exception ex)
+ {
+ MainPage.Log($"RoomPage ReloadPage error :\r\n {ex.Message}");
+ }
}
}
@@ -83,6 +90,7 @@
var list = room.GetRoomFunctions(false);
+
foreach (var function in list)
{
if (MainPage.RoomNotSupportFunctionList.Contains(function.spk))
@@ -95,7 +103,7 @@
functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
- if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
+ if (function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
var functionDiv = new FunctionControlZone(function, null)
{
--
Gitblit v1.8.0