From 321d2f007c7f85e933b3f90266af07e10c6b4658 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 十二月 2020 21:06:20 +0800
Subject: [PATCH] 2020-12-03 1.修改推送ID保存方法

---
 HDL_ON/UI/UI2/1-HomePage/HomePage.cs |   44 +++++++++++++++++++++++++++++++-------------
 1 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index a9eb697..f073a38 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()
@@ -158,7 +165,7 @@
                 };
                 environmentalView.AddChidren(btnTempIcon);
 
-                btnTempValues = new Button()
+                btnTempValues = new TextButton()
                 {
                     X = btnTempIcon.Right + Application.GetRealWidth(4),
                     Width = Application.GetRealWidth(30),
@@ -180,7 +187,7 @@
                 };
                 environmentalView.AddChidren(btnHumidityIcon);
 
-                btnHumidityValues = new Button()
+                btnHumidityValues = new TextButton()
                 {
                     X = btnHumidityIcon.Right + Application.GetRealWidth(4),
                     Width = Application.GetRealWidth(30),
@@ -202,7 +209,7 @@
                 };
                 environmentalView.AddChidren(btnPm25Icon);
 
-                btnPm25Values = new Button()
+                btnPm25Values = new TextButton()
                 {
                     X = btnPm25Icon.Right + Application.GetRealWidth(4),
                     Width = Application.GetRealWidth(130),
@@ -226,14 +233,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,19 +252,19 @@
                 };
                 msgView.AddChidren(btnMsgIcon);
 
-                Button btnMsg;
+               
                 btnMsg = new Button()
                 {
                     X = Application.GetRealWidth(10) + btnMsgIcon.Right,
                     Width = Application.GetRealWidth(240),
-                    Text = "鏃�",
+                    Text = "...",
                     TextColor = CSS_Color.MainBackgroundColor,
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                     TextAlignment = TextAlignment.CenterLeft,
                 };
                 msgView.AddChidren(btnMsg);
 
-                Button btnMsgTime;
+             
                 btnMsgTime = new Button()
                 {
                     X = Application.GetRealWidth(299),
@@ -267,6 +274,9 @@
                     TextAlignment = TextAlignment.CenterLeft,
                 };
                 msgView.AddChidren(btnMsgTime);
+
+                LoadEvent_GotoMessageCenterPage();
+
                 #endregion
 
                 #endregion
@@ -339,6 +349,9 @@
                 #endregion
 
                 LoadEvent_ChangeShowedFunctionType();
+
+                // 鏌ヨ鏈娑堟伅骞舵樉绀�
+                GetUnreadPushMessages();
             }
             catch (Exception ex)
             {
@@ -509,6 +522,9 @@
                         BackgroundImagePath = (scene as Scene).ImagePath,
                     };
                     rowView.AddChidren(functionView);
+
+                    //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+                    ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, functionView);
 
                     LoadSceneFunctionDiv( functionView, scene);
                     index++;
@@ -868,7 +884,9 @@
                     Action refreshAction = () => {
                         btnName.Text = scene.name;
                         btnZone.Text = scene.GetRoomListName();
-                        view.BackgroundImagePath = (scene as Scene).ImagePath;
+                        //view.BackgroundImagePath = (scene as Scene).ImagePath;
+                        //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+                        ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, view);
                     };
                     var aep = new SceneEditPage(scene as Scene, backAction);
                     MainPage.BasePageView.AddChidren(aep);

--
Gitblit v1.8.0