From 56b417e5bcdf4f34ddcda8c7e56fbac6584e615e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 07 十二月 2020 17:24:54 +0800
Subject: [PATCH] 2020-12-7-02

---
 HDL_ON/UI/UI2/1-HomePage/HomePage.cs |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 9c2a22e..470d76d 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -1,4 +1,4 @@
-锘縰sing System;
+锘縰sing System;
 using System.Collections.Generic;
 using System.Text;
 using HDL_ON.DAL;
@@ -144,8 +144,7 @@
                     System.Threading.Tasks.Task.Run(() =>
                         {
                             //DriverLayer.Control.Ins.SearchLoaclGateway();
-                            //MainPage.GetRoomList();
-                            MainPage.GetDeviceList();
+                            MainPage.InitializationData();
                         });
                 };
 #endif
@@ -259,7 +258,7 @@
                 {
                     X = Application.GetRealWidth(10) + btnMsgIcon.Right,
                     Width = Application.GetRealWidth(240),
-                    Text = "鏃�",
+                    Text = "...",
                     TextColor = CSS_Color.MainBackgroundColor,
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                     TextAlignment = TextAlignment.CenterLeft,
@@ -351,6 +350,9 @@
                 #endregion
 
                 LoadEvent_ChangeShowedFunctionType();
+
+                // 鏌ヨ鏈娑堟伅骞舵樉绀�
+                GetUnreadPushMessages();
             }
             catch (Exception ex)
             {
@@ -518,9 +520,12 @@
                         Width = Application.GetRealWidth(164),
                         Height = Application.GetRealWidth(122),
                         Tag = scene.sid,
-                        BackgroundImagePath = (scene as Scene).ImagePath,
+                        BackgroundImagePath = scene.ImagePath,
                     };
                     rowView.AddChidren(functionView);
+
+                    //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+                    ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, functionView);
 
                     LoadSceneFunctionDiv( functionView, scene);
                     index++;
@@ -880,9 +885,11 @@
                     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);
+                    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