From 7d9e5d946d08f0b53ff25d1c25dcf83efb68b734 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 15 十二月 2020 09:08:59 +0800
Subject: [PATCH] 20201215-1

---
 HDL_ON/UI/UI2/1-HomePage/HomePage.cs |   49 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 5099f97..83b6eee 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -1,7 +1,8 @@
-锘縰sing System;
+锘縰sing System;
 using System.Collections.Generic;
 using System.Text;
 using HDL_ON.DAL;
+using HDL_ON.DriverLayer;
 using HDL_ON.Entity;
 using HDL_ON.UI.CSS;
 using Newtonsoft.Json;
@@ -101,7 +102,7 @@
                 topView = new FrameLayout()
                 {
                     Height = Application.GetRealHeight(216),
-                    BackgroundImagePath = DB_ResidenceData.residenceData.residenceImage,
+                    BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
                 };
                 bodyView.AddChidren(topView);
 
@@ -122,6 +123,21 @@
                     Radius = (uint)Application.GetRealWidth(3),
                 };
                 topView.AddChidren(btnLinkStateTip);
+                if (Control.Ins.GatewayOnline)
+                {
+                    if (Control.Ins.IsRemote)
+                    {
+                        bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
+                    }
+                    else
+                    {
+                        bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
+                    }
+                }
+                else
+                {
+                    bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
+                }
 
                 btnResidenceName = new Button()
                 {
@@ -132,7 +148,7 @@
                     TextColor = CSS_Color.MainBackgroundColor,
                     TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
                     TextAlignment = TextAlignment.CenterLeft,
-                    Text = DB_ResidenceData.residenceData.residecenInfo.Name,
+                    Text = DB_ResidenceData.Instance.CurrentRegion.Name,
                     IsBold = true
                 };
                 topView.AddChidren(btnResidenceName);
@@ -145,6 +161,7 @@
                         {
                             //DriverLayer.Control.Ins.SearchLoaclGateway();
                             MainPage.InitializationData();
+                            //DriverLayer.Control.Ins.IsRemote = true;
                         });
                 };
 #endif
@@ -258,7 +275,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,
@@ -350,6 +367,9 @@
                 #endregion
 
                 LoadEvent_ChangeShowedFunctionType();
+
+                // 鏌ヨ鏈娑堟伅骞舵樉绀�
+                GetUnreadPushMessages();
             }
             catch (Exception ex)
             {
@@ -375,7 +395,7 @@
             try
             {
                 int index = 0;
-                foreach (var function in DB_ResidenceData.functionList.GetAllDeviceFunctionList())
+                foreach (var function in FunctionList.List.GetDeviceFunctionList())
                 {
                     //闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
                     if (function.functionCategory == FunctionCategory.Music)
@@ -490,15 +510,15 @@
             try
             {
                 int index = 0;
-                foreach (var scene in DB_ResidenceData.functionList.scenes)
+                foreach (var scene in FunctionList.List.scenes)
                 {
                     if (!scene.collect)
                         continue;
-                    if (scene.roomIds.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
-                    {
-                        scene.collect = false;
-                        continue;
-                    }
+                    //if (scene.roomIds.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
+                    //{
+                    //    scene.collect = false;
+                    //    continue;
+                    //}
                     if (index % 2 == 0)
                     {
                         sceneFunctionView.AddChidren(new Button() { Height = Application.GetRealHeight(7) });
@@ -520,6 +540,9 @@
                         BackgroundImagePath = scene.ImagePath,
                     };
                     rowView.AddChidren(functionView);
+
+                    //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+                    ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, functionView);
 
                     LoadSceneFunctionDiv( functionView, scene);
                     index++;
@@ -879,7 +902,9 @@
                     Action refreshAction = () => {
                         btnName.Text = scene.name;
                         btnZone.Text = scene.GetRoomListName();
-                        view.BackgroundImagePath = scene.ImagePath;
+                        //view.BackgroundImagePath = (scene as Scene).ImagePath;
+                        //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+                        ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, view);
                     };
                     var aep = new SceneEditPage(scene, backAction);
                     MainPage.BasePageView.AddChidren(aep);

--
Gitblit v1.8.0