From 203c3a3ffde6259413d9743f6a723b95b1e7989c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 06 七月 2023 22:43:05 +0800
Subject: [PATCH] 门锁功能
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 3c04eec..5158ff5 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘�
+using System;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -61,8 +62,14 @@
{
if (bodyView != null)
{
- bodyView.RemoveAll();
- LoadPage();
+ try
+ {
+ bodyView.RemoveAll();
+ LoadPage();
+ }catch (Exception ex)
+ {
+ MainPage.Log($"RoomPage ReloadPage error :\r\n {ex.Message}");
+ }
}
}
@@ -88,10 +95,13 @@
{
continue;
}
+#if DEBUG
+ //throw new ArgumentNullException();
+#endif
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)
{
@@ -127,22 +137,32 @@
functionListView.AddChidren(functionDiv);
}
}
- foreach (var scene in room.GetRoomScenes(false))
+ try
{
- functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
- var sceneRow = new FrameLayout()
+ foreach (var scene in room.GetRoomScenes(false))
{
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(116),
- Radius = (uint)Application.GetMinRealAverage(12),
- BorderColor = 0x00FFFFFF,
- BorderWidth = 1,
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = "Scene-" + scene.sid
- };
- functionListView.AddChidren(sceneRow);
- LoadSceneRow(sceneRow, scene);
+ if (scene == null)
+ {
+ continue;
+ }
+ functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
+ var sceneRow = new FrameLayout()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(116),
+ Radius = (uint)Application.GetMinRealAverage(12),
+ BorderColor = 0x00FFFFFF,
+ BorderWidth = 1,
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ Tag = "Scene-" + scene.sid
+ };
+ functionListView.AddChidren(sceneRow);
+ LoadSceneRow(sceneRow, scene);
+ }
+ }catch (Exception ex)
+ {
+ MainPage.Log($"RoomPage LoadPage Error:{ex.Message}");
}
}
--
Gitblit v1.8.0