From 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 12:04:42 +0800
Subject: [PATCH] 2020-12-15-1
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 88 +++++++++++++++++++++++++++++++-------------
1 files changed, 62 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index a9eb697..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;
@@ -34,15 +35,15 @@
/// <summary>
/// 褰撳墠娓╁害淇℃伅
/// </summary>
- Button btnTempValues;
+ TextButton btnTempValues;
/// <summary>
/// 褰撳墠婀垮害淇℃伅
/// </summary>
- Button btnHumidityValues;
+ TextButton btnHumidityValues;
/// <summary>
/// 褰撳墠pm2.5鐘舵��
/// </summary>
- Button btnPm25Values;
+ TextButton btnPm25Values;
/// <summary>
/// 鍒囨崲鏄剧ず鍔熻兘绫诲瀷鍖哄煙
/// </summary>
@@ -80,6 +81,13 @@
bool CurShowTypeIsFunction = true;
#endregion
+ #region 鎶ヨ淇℃伅
+ Button btnMsgBg;
+ Button btnMsgTime;
+ Button btnMsg;
+ Button btnMsgIcon;
+ #endregion
+
public HomePage()
{
bodyView = this;
@@ -94,7 +102,7 @@
topView = new FrameLayout()
{
Height = Application.GetRealHeight(216),
- BackgroundImagePath = DB_ResidenceData.residenceData.residenceImage,
+ BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
};
bodyView.AddChidren(topView);
@@ -115,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()
{
@@ -125,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);
@@ -136,7 +159,9 @@
{
System.Threading.Tasks.Task.Run(() =>
{
- DriverLayer.Control.Ins.SearchLoaclGateway();
+ //DriverLayer.Control.Ins.SearchLoaclGateway();
+ MainPage.InitializationData();
+ //DriverLayer.Control.Ins.IsRemote = true;
});
};
#endif
@@ -158,7 +183,7 @@
};
environmentalView.AddChidren(btnTempIcon);
- btnTempValues = new Button()
+ btnTempValues = new TextButton()
{
X = btnTempIcon.Right + Application.GetRealWidth(4),
Width = Application.GetRealWidth(30),
@@ -180,7 +205,7 @@
};
environmentalView.AddChidren(btnHumidityIcon);
- btnHumidityValues = new Button()
+ btnHumidityValues = new TextButton()
{
X = btnHumidityIcon.Right + Application.GetRealWidth(4),
Width = Application.GetRealWidth(30),
@@ -202,7 +227,7 @@
};
environmentalView.AddChidren(btnPm25Icon);
- btnPm25Values = new Button()
+ btnPm25Values = new TextButton()
{
X = btnPm25Icon.Right + Application.GetRealWidth(4),
Width = Application.GetRealWidth(130),
@@ -226,14 +251,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 +270,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 +292,9 @@
TextAlignment = TextAlignment.CenterLeft,
};
msgView.AddChidren(btnMsgTime);
+
+ LoadEvent_GotoMessageCenterPage();
+
#endregion
#endregion
@@ -339,6 +367,9 @@
#endregion
LoadEvent_ChangeShowedFunctionType();
+
+ // 鏌ヨ鏈娑堟伅骞舵樉绀�
+ GetUnreadPushMessages();
}
catch (Exception ex)
{
@@ -364,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)
@@ -479,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) });
@@ -506,9 +537,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++;
@@ -868,9 +902,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