From b822232f0743d22e5bd3847eb993894bf090b214 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 02 七月 2024 15:33:48 +0800
Subject: [PATCH] 备份
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 96 +++++++++++++++++++++++------------------------
1 files changed, 47 insertions(+), 49 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 7bbf394..c440bdd 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -98,55 +98,6 @@
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.LightCCT || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
- {
- var functionDiv = new FunctionControlZone(function, null)
- {
- 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 = function.spk + function.sid
- };
- functionDiv.LoadFunctionDiv();
- functionListView.AddChidren(functionDiv);
- }
- else
- {
-
- var functionDiv = new FunctionControlZone(function, () =>
- {
- this.ReLoadPage(); //鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I
- })
- {
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(96),
- Radius = (uint)Application.GetMinRealAverage(12),
- BorderColor = 0x00FFFFFF,
- BorderWidth = 1,
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = function.spk + function.sid
- };
- functionDiv.LoadFunctionDiv();
- functionListView.AddChidren(functionDiv);
- }
- }
try
{
foreach (var scene in room.GetRoomScenes(false))
@@ -174,6 +125,53 @@
{
MainPage.Log($"RoomPage LoadPage Error:{ex.Message}");
}
+
+ foreach (var function in list)
+ {
+ if (MainPage.RoomNotSupportFunctionList.Contains(function.spk))
+ {
+ continue;
+ }
+
+ functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
+
+ if (function.spk == SPK.LightRGBW || function.spk == SPK.LightCCT || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
+ {
+ var functionDiv = new FunctionControlZone(function, null)
+ {
+ 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 = function.spk + function.sid
+ };
+ functionDiv.LoadFunctionDiv();
+ functionListView.AddChidren(functionDiv);
+ }
+ else
+ {
+
+ var functionDiv = new FunctionControlZone(function, () =>
+ {
+ this.ReLoadPage(); //鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I
+ })
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(96),
+ Radius = (uint)Application.GetMinRealAverage(12),
+ BorderColor = 0x00FFFFFF,
+ BorderWidth = 1,
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ Tag = function.spk + function.sid
+ };
+ functionDiv.LoadFunctionDiv();
+ functionListView.AddChidren(functionDiv);
+ }
+ }
}
--
Gitblit v1.8.0