From 23ee4f8c373f9abecf079ef9d4297d8b6cd8d5e6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 15:16:00 +0800
Subject: [PATCH] Merge branch 'NewFilePath'
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 65 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 9c2a22e..b6c33ea 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;
@@ -93,6 +94,12 @@
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
}
+ public override void RemoveFromParent()
+ {
+ UnregisterGetPushMessageAction();
+ base.RemoveFromParent();
+ }
+
public void LoadPage()
{
try
@@ -101,7 +108,7 @@
topView = new FrameLayout()
{
Height = Application.GetRealHeight(216),
- BackgroundImagePath = DB_ResidenceData.residenceData.residenceImage,
+ BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
};
bodyView.AddChidren(topView);
@@ -122,6 +129,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 +154,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);
@@ -144,8 +166,8 @@
System.Threading.Tasks.Task.Run(() =>
{
//DriverLayer.Control.Ins.SearchLoaclGateway();
- //MainPage.GetRoomList();
- MainPage.GetDeviceList();
+ MainPage.InitializationData();
+ //DriverLayer.Control.Ins.IsRemote = true;
});
};
#endif
@@ -259,7 +281,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 +373,10 @@
#endregion
LoadEvent_ChangeShowedFunctionType();
+
+ // 鏌ヨ鏈娑堟伅骞舵樉绀�
+ GetUnreadPushMessages();
+ RegisterGetPushMessageAction();
}
catch (Exception ex)
{
@@ -376,7 +402,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)
@@ -491,15 +517,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) });
@@ -518,9 +544,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,11 +909,13 @@
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);
+ aep.LoadPage( refreshAction);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
}
--
Gitblit v1.8.0