From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 103 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 70 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 65bd9ea..782e8c7 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -20,6 +20,10 @@
/// </summary>
FrameLayout topView;
/// <summary>
+ /// 杩炴帴鐘舵�佹彁绀�
+ /// </summary>
+ Button btnLinkStateTip;
+ /// <summary>
///浣忓畢鍚嶇О鏄剧ず
/// </summary>
Button btnResidenceName;
@@ -101,9 +105,20 @@
};
topView.AddChidren(btnTop);
- btnResidenceName = new Button()
+ btnLinkStateTip = new Button()
{
X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(46),
+ Width = Application.GetRealWidth(6),
+ Height = Application.GetRealWidth(6),
+ BackgroundColor = CSS_Color.LinkTipFail,
+ Radius = (uint)Application.GetRealWidth(3),
+ };
+ topView.AddChidren(btnLinkStateTip);
+
+ btnResidenceName = new Button()
+ {
+ X = Application.GetRealWidth(26),
Y = Application.GetRealHeight(32),
Width = Application.GetRealWidth(400),
Height = Application.GetRealHeight(33),
@@ -116,11 +131,13 @@
topView.AddChidren(btnResidenceName);
#if DEBUG
+ //鎼滅储缃戝叧
btnResidenceName.MouseUpEventHandler = (sender, e) =>
{
- System.Threading.Tasks.Task.Run(
- async () => { await DAL.Net.MqttCommon.StartMqtt();
- });
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ DriverLayer.Control.Ins.SearchLoaclGateway();
+ });
};
#endif
@@ -188,7 +205,7 @@
btnPm25Values = new Button()
{
X = btnPm25Icon.Right + Application.GetRealWidth(4),
- Width = Application.GetRealWidth(30),
+ Width = Application.GetRealWidth(130),
Gravity = Gravity.CenterVertical,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
@@ -320,7 +337,6 @@
contentView.PageIndex = 0;
#endregion
- bodyView.AddChidren(new Button() { Y = changeView.Bottom, Height = Application.GetRealHeight(4), BackgroundColor = 0xAAF2F3F7 });
LoadEvent_ChangeShowedFunctionType();
}
@@ -328,6 +344,12 @@
{
MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
}
+
+
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ //DriverLayer.Control.Ins.SearchLoaclGateway();
+ });
}
/// <summary>
@@ -342,7 +364,7 @@
try
{
int index = 0;
- foreach (var function in DB_ResidenceData.residenceData.functionList.GetAllDeviceFunctionList())
+ foreach (var function in DB_ResidenceData.functionList.GetAllDeviceFunctionList())
{
//闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
if (function.functionCategory == FunctionCategory.Music)
@@ -371,11 +393,11 @@
{
if (!function.collection)
continue;
- if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
- {
- function.collection = false;
- continue;
- }
+ //if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
+ //{
+ // function.collection = false;
+ // continue;
+ //}
}
if (index % 2 == 0)
{
@@ -457,7 +479,7 @@
try
{
int index = 0;
- foreach (var function in DB_ResidenceData.residenceData.functionList.scenes)
+ foreach (var function in DB_ResidenceData.functionList.scenes)
{
if (!function.collection)
continue;
@@ -679,14 +701,14 @@
btnPower.IsSelected = false;
Music.SendMethod.Pause(a31player);
a31player.A31PlayStatus.status = "pause";
- a31player.on_off = "off";
+ a31player.trait_on_off.curValue = "off";
}
else
{
btnPower.IsSelected = true;
Music.SendMethod.Play(a31player);
a31player.A31PlayStatus.status = "play";
- a31player.on_off = "on";
+ a31player.trait_on_off.curValue = "on";
}
UpdataFunctionStates(a31player);
};
@@ -770,7 +792,6 @@
}
}
-
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗鍗＄墖
/// </summary>
@@ -778,6 +799,24 @@
{
try
{
+ Button btnCoverd = new Button()
+ {
+ UnSelectedImagePath = "Collection/SceneCovered.png",
+ };
+ view.AddChidren(btnCoverd);
+
+ Button btnSettingIcon;
+ btnSettingIcon = new Button()
+ {
+ X = Application.GetRealWidth(4),
+ Y = Application.GetRealWidth(4),
+ Height = Application.GetRealWidth(32),
+ Width = Application.GetRealWidth(32),
+ //UnSelectedImagePath = "FunctionIcon/Scene/DelayIcon.png",
+ UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
+ };
+ view.AddChidren(btnSettingIcon);
+
Button btnName;
btnName = new Button()
{
@@ -807,22 +846,6 @@
};
view.AddChidren(btnZone);
- Button btnCoverd = new Button()
- {
- UnSelectedImagePath = "Collection/SceneCovered.png",
- };
- view.AddChidren(btnCoverd);
-
- Button btnDelayIcon;
- btnDelayIcon = new Button()
- {
- X = Application.GetRealWidth(12),
- Y = Application.GetRealWidth(12),
- Height = Application.GetRealWidth(24),
- Width = Application.GetRealWidth(24),
- UnSelectedImagePath = "FunctionIcon/Scene/DelayIcon.png"
- };
- view.AddChidren(btnDelayIcon);
Button btnCollection;
btnCollection = new Button()
@@ -837,8 +860,22 @@
view.AddChidren(btnCollection);
LoadEvent_FunctionCollection(btnCollection, function, false);
- LoadEvent_ControlScene(btnCoverd, function);
+ LoadEvent_ControlScene(btnCoverd,btnName,btnZone, function);
+ btnSettingIcon.MouseUpEventHandler = (sender, e) => {
+ Action backAction = () => {
+ //LoadSceneFunctionControlZone();
+ };
+ Action refreshAction = () => {
+ btnName.Text = function.name;
+ btnZone.Text = function.GetRoomListName();
+ view.BackgroundImagePath = (function as Scene).ImagePath;
+ };
+ var aep = new SceneEditPage(function as Scene, backAction);
+ MainPage.BasePageView.AddChidren(aep);
+ aep.LoadPage(StringId.EditScene, refreshAction);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
}
catch (Exception ex)
{
--
Gitblit v1.8.0