From e4acb04670cee588ad45ef7d57a50dc3c928f2d9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 04 六月 2024 13:23:17 +0800
Subject: [PATCH] 备份
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 59 +++++++++++++++++++++++++++++------------------------------
1 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index dc72687..7bbf394 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -95,36 +95,9 @@
};
bodyView.AddChidren(functionListView);
- try
- {
- foreach (var scene in room.GetRoomScenes(false))
- {
- 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}");
- }
-
var list = room.GetRoomFunctions(false);
+
+
foreach (var function in list)
{
if (MainPage.RoomNotSupportFunctionList.Contains(function.spk))
@@ -174,7 +147,33 @@
functionListView.AddChidren(functionDiv);
}
}
-
+ try
+ {
+ foreach (var scene in room.GetRoomScenes(false))
+ {
+ 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