From 23ca39219c5075d829d14137cb54896a24ae513d Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 04 十二月 2020 13:57:08 +0800
Subject: [PATCH] 20201204

---
 HDL_ON/UI/UI2/1-HomePage/HomePage.cs |   41 ++++++++++++++++++++++++++---------------
 1 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index a9eb697..5099f97 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -34,15 +34,15 @@
         /// <summary>
         /// 褰撳墠娓╁害淇℃伅
         /// </summary>
-        Button btnTempValues;
+        TextButton btnTempValues;
         /// <summary>
         /// 褰撳墠婀垮害淇℃伅
         /// </summary>
-        Button btnHumidityValues;
+        TextButton btnHumidityValues;
         /// <summary>
         /// 褰撳墠pm2.5鐘舵��
         /// </summary>
-        Button btnPm25Values;
+        TextButton btnPm25Values;
         /// <summary>
         /// 鍒囨崲鏄剧ず鍔熻兘绫诲瀷鍖哄煙
         /// </summary>
@@ -78,6 +78,13 @@
         /// 褰撳墠鏄剧ず瀵规帶鍒剁被鍨嬫槸鍚︽槸璁惧鍔熻兘鎺у埗
         /// </summary>
         bool CurShowTypeIsFunction = true;
+        #endregion
+
+        #region 鎶ヨ淇℃伅
+        Button btnMsgBg;
+        Button btnMsgTime;
+        Button btnMsg;
+        Button btnMsgIcon;
         #endregion
 
         public HomePage()
@@ -136,7 +143,8 @@
                 {
                     System.Threading.Tasks.Task.Run(() =>
                         {
-                            DriverLayer.Control.Ins.SearchLoaclGateway();
+                            //DriverLayer.Control.Ins.SearchLoaclGateway();
+                            MainPage.InitializationData();
                         });
                 };
 #endif
@@ -158,7 +166,7 @@
                 };
                 environmentalView.AddChidren(btnTempIcon);
 
-                btnTempValues = new Button()
+                btnTempValues = new TextButton()
                 {
                     X = btnTempIcon.Right + Application.GetRealWidth(4),
                     Width = Application.GetRealWidth(30),
@@ -180,7 +188,7 @@
                 };
                 environmentalView.AddChidren(btnHumidityIcon);
 
-                btnHumidityValues = new Button()
+                btnHumidityValues = new TextButton()
                 {
                     X = btnHumidityIcon.Right + Application.GetRealWidth(4),
                     Width = Application.GetRealWidth(30),
@@ -202,7 +210,7 @@
                 };
                 environmentalView.AddChidren(btnPm25Icon);
 
-                btnPm25Values = new Button()
+                btnPm25Values = new TextButton()
                 {
                     X = btnPm25Icon.Right + Application.GetRealWidth(4),
                     Width = Application.GetRealWidth(130),
@@ -226,14 +234,14 @@
                 };
                 topView.AddChidren(msgView);
 
-                var btngb = new Button()
+                btnMsgBg = new Button()
                 {
                     BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,
                     Alpha = 0.4f,
                 };
-                msgView.AddChidren(btngb);
+                msgView.AddChidren(btnMsgBg);
 
-                Button btnMsgIcon;
+              
                 btnMsgIcon = new Button()
                 {
                     X = Application.GetRealWidth(12),
@@ -245,7 +253,7 @@
                 };
                 msgView.AddChidren(btnMsgIcon);
 
-                Button btnMsg;
+               
                 btnMsg = new Button()
                 {
                     X = Application.GetRealWidth(10) + btnMsgIcon.Right,
@@ -257,7 +265,7 @@
                 };
                 msgView.AddChidren(btnMsg);
 
-                Button btnMsgTime;
+             
                 btnMsgTime = new Button()
                 {
                     X = Application.GetRealWidth(299),
@@ -267,6 +275,9 @@
                     TextAlignment = TextAlignment.CenterLeft,
                 };
                 msgView.AddChidren(btnMsgTime);
+
+                LoadEvent_GotoMessageCenterPage();
+
                 #endregion
 
                 #endregion
@@ -506,7 +517,7 @@
                         Width = Application.GetRealWidth(164),
                         Height = Application.GetRealWidth(122),
                         Tag = scene.sid,
-                        BackgroundImagePath = (scene as Scene).ImagePath,
+                        BackgroundImagePath = scene.ImagePath,
                     };
                     rowView.AddChidren(functionView);
 
@@ -868,9 +879,9 @@
                     Action refreshAction = () => {
                         btnName.Text = scene.name;
                         btnZone.Text = scene.GetRoomListName();
-                        view.BackgroundImagePath = (scene as Scene).ImagePath;
+                        view.BackgroundImagePath = scene.ImagePath;
                     };
-                    var aep = new SceneEditPage(scene as Scene, backAction);
+                    var aep = new SceneEditPage(scene, backAction);
                     MainPage.BasePageView.AddChidren(aep);
                     aep.LoadPage(StringId.EditScene, refreshAction);
                     MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

--
Gitblit v1.8.0