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/ClassificationPage.cs |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 784cc5c..4f332e2 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -258,9 +258,9 @@
                     TextSize = CSS_FontSize.SubheadingFontSize,
                 };
                 roomView.AddChidren(btnFloorAndRoomName);
-#if stage2
+
                 #region 鐜鏁版嵁
-                                var environmentalView = new FrameLayout()
+                var environmentalView = new FrameLayout()
                                 {
                                     Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom,
                                     Height = Application.GetRealHeight(32),
@@ -338,7 +338,6 @@
                                 environmentalView.AddChidren(btnPm25Values);
                                 roomView.AddChidren(environmentalView);
                 #endregion
-#endif
                 var btnAllClose = new Button()
                 {
                     X = Application.GetRealWidth(282),
@@ -360,7 +359,11 @@
 
                 roomViewbgColor.MouseUpEventHandler += (sender, e) =>
                 {
-                    var view = new RoomPage(room);
+                    Action<Room > ReloadRoomName = (obj) => {
+                        btnFloorAndRoomName.Text = obj.floorName + obj.name;
+                    };
+
+                    var view = new RoomPage(room, ReloadRoomName);
                     MainPage.BasePageView.AddChidren(view);
                     view.LoadPage();
                     MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -477,7 +480,7 @@
 
                 if (functionCount == 0 && item != ShowFunction.Music)
                 {
-                    continue;
+                    //continue;
                 }
                 functionCategoryCount++;
 

--
Gitblit v1.8.0