From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 9ee72a0..f3f4c36 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -21,23 +21,34 @@
#region
static Room room;
- #endregion
+ Action skipEditPageAction;
+ Action ReloadRoomName;
+ #endregion
- public RoomPage(Room r)
+ public RoomPage(Room r,Action rrn)
{
bodyView = this;
room = r;
+ skipEditPageAction = () =>
+ {
+ LoadEvent_SkipEditRoomPage();
+ };
+ ReloadRoomName = rrn;
+ }
+ /// <summary>
+ /// 閲嶈浇鐣岄潰
+ /// </summary>
+ void ReLoadPage()
+ {
+ bodyView.RemoveAll();
+ LoadPage();
}
public void LoadPage()
{
- Action skipAction = () =>
- {
- LoadEvent_SkipEditRoomPage();
- };
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView,room.name).LoadTopView(room ,skipAction);
+ new TopViewDiv(bodyView,room.name).LoadTopView_RoomTop(ReloadRoomName, skipEditPageAction);
functionListView = new VerticalScrolViewLayout()
{
@@ -46,7 +57,7 @@
};
bodyView.AddChidren(functionListView);
- foreach (var function in room.functions)
+ foreach (var function in room.GetRoomFunctions(false))
{
if (function.functionCategory == FunctionCategory.Sensor)
{
--
Gitblit v1.8.0