From a0b77501012265c4638c9f49ccfd1e6cd0f71a45 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 09 三月 2023 18:44:00 +0800
Subject: [PATCH] 2023年03月09日18:43:53
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index ab78fd4..3c04eec 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -53,6 +53,7 @@
deleteAction = delAction;
this.modifyImageAction = modifyImageAction;
}
+
/// <summary>
/// 閲嶈浇鐣岄潰
/// </summary>
@@ -65,22 +66,25 @@
}
}
+
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView,room.roomName).LoadTopView_RoomTop(ReloadRoomName, skipEditPageAction);
+ new TopViewDiv(bodyView, room.roomName).LoadTopView_RoomTop(ReloadRoomName, skipEditPageAction);
functionListView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(603-12),
+ Height = Application.GetRealHeight(603 - 12),
};
bodyView.AddChidren(functionListView);
- foreach (var function in room.GetRoomFunctions(false))
+ var list = room.GetRoomFunctions(false);
+
+ foreach (var function in list)
{
- if (MainPage.RoomNotSupportFunctionList.Contains( function.spk))
+ if (MainPage.RoomNotSupportFunctionList.Contains(function.spk))
{
continue;
}
@@ -89,7 +93,7 @@
if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
- var functionDiv = new FunctionControlZone(function)
+ var functionDiv = new FunctionControlZone(function, null)
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
@@ -105,7 +109,10 @@
}
else
{
- var functionDiv = new FunctionControlZone(function)
+ var functionDiv = new FunctionControlZone(function, () =>
+ {
+ this.ReLoadPage();
+ })
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
@@ -132,7 +139,7 @@
BorderColor = 0x00FFFFFF,
BorderWidth = 1,
BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = "Scene-" + scene.sid
+ Tag = "Scene-" + scene.sid
};
functionListView.AddChidren(sceneRow);
LoadSceneRow(sceneRow, scene);
@@ -147,7 +154,7 @@
/// </summary>
public void LoadSceneRow(FrameLayout bodyDiv, Scene scene)
{
- var btnIcon = new Button()
+ var btnIcon = new Button()
{
X = Application.GetRealWidth(10),
Y = Application.GetRealHeight(15),
@@ -214,15 +221,15 @@
btnName.X = Application.GetRealWidth(52 + 16);
}
//鍔犺浇鍦烘櫙鎺у埗浜嬩欢
- LoadEvent_ControlScene(btnName,btnFromFloor,bodyDiv,scene );
+ LoadEvent_ControlScene(btnName, btnFromFloor, bodyDiv, scene);
- LoadEvent_FunctionCollection(btnCollectionIcon,scene);
+ LoadEvent_FunctionCollection(btnCollectionIcon, scene);
}
/// <summary>
/// 鍔犺浇鍔熻兘鏀惰棌鎸夐挳浜嬩欢
/// </summary>
- void LoadEvent_FunctionCollection(Button btnCollectionIcon,Scene scene)
+ void LoadEvent_FunctionCollection(Button btnCollectionIcon, Scene scene)
{
btnCollectionIcon.MouseUpEventHandler += (sender, e) =>
{
@@ -233,9 +240,10 @@
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
/// </summary>
- void LoadEvent_ControlScene(Button btnName,Button btnFromFloor,FrameLayout bodyDiv, Scene scene)
+ void LoadEvent_ControlScene(Button btnName, Button btnFromFloor, FrameLayout bodyDiv, Scene scene)
{
- EventHandler<MouseEventArgs> upEvent = (sender, e) => {
+ EventHandler<MouseEventArgs> upEvent = (sender, e) =>
+ {
DriverLayer.Control.Ins.ControlScene(scene);
string msg = scene.name + Language.StringByID(StringId.AlreadyOpened);
new PublicAssmebly().TipMsgAutoClose(msg, false);
@@ -245,5 +253,6 @@
bodyDiv.MouseUpEventHandler = upEvent;
}
+
}
}
--
Gitblit v1.8.0