From ea0b1e8e5f43c5fd0a7d479e25ede3b8cbea464a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 02 十二月 2024 17:17:19 +0800
Subject: [PATCH] tcp;可视对讲；
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index dc72687..c440bdd 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -95,6 +95,9 @@
};
bodyView.AddChidren(functionListView);
+ var list = room.GetRoomFunctions(false);
+
+
try
{
foreach (var scene in room.GetRoomScenes(false))
@@ -118,22 +121,17 @@
functionListView.AddChidren(sceneRow);
LoadSceneRow(sceneRow, scene);
}
- }
- catch (Exception ex)
+ }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))
{
continue;
}
-#if DEBUG
- //throw new ArgumentNullException();
-#endif
functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
@@ -155,7 +153,7 @@
}
else
{
-
+
var functionDiv = new FunctionControlZone(function, () =>
{
this.ReLoadPage(); //鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I
@@ -174,7 +172,6 @@
functionListView.AddChidren(functionDiv);
}
}
-
}
--
Gitblit v1.8.0