From 4c17caa61bc3b0a05a2b303bccdfedfbf3853f6d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 24 十一月 2020 15:58:10 +0800
Subject: [PATCH] 2020-11-24 1.优化登录界面失败提示。
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 5de0c0e..411c417 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -20,19 +20,35 @@
#endregion
#region
- Room room;
- #endregion
+ static Room room;
+ Action skipEditPageAction;
+ Action<Room> ReloadRoomName;
+ #endregion
- public RoomPage(Room r)
+ public RoomPage(Room r,Action<Room> rrn)
{
bodyView = this;
room = r;
+ skipEditPageAction = () =>
+ {
+ LoadEvent_SkipEditRoomPage();
+ };
+ ReloadRoomName = rrn;
+ }
+ /// <summary>
+ /// 閲嶈浇鐣岄潰
+ /// </summary>
+ void ReLoadPage()
+ {
+ bodyView.RemoveAll();
+ LoadPage();
}
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView,room.name).LoadTopView();
+
+ new TopViewDiv(bodyView,room.name).LoadTopView(skipEditPageAction);
functionListView = new VerticalScrolViewLayout()
{
@@ -41,8 +57,13 @@
};
bodyView.AddChidren(functionListView);
- foreach (var function in room.functions)
+ foreach (var function in room.GetRoomFunctions(false))
{
+ if (function.functionCategory == FunctionCategory.Sensor)
+ {
+ continue;
+ }
+
functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
--
Gitblit v1.8.0