From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 99 ++++++++++++++++++++++++++++---------------------
1 files changed, 56 insertions(+), 43 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 9a2f9e3..e29a96a 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -34,15 +34,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 +80,13 @@
bool CurShowTypeIsFunction = true;
#endregion
+ #region 鎶ヨ淇℃伅
+ Button btnMsgBg;
+ Button btnMsgTime;
+ Button btnMsg;
+ Button btnMsgIcon;
+ #endregion
+
public HomePage()
{
bodyView = this;
@@ -111,7 +118,7 @@
Y = Application.GetRealHeight(46),
Width = Application.GetRealWidth(6),
Height = Application.GetRealWidth(6),
- BackgroundColor = CSS_Color.MainColor,
+ BackgroundColor = CSS_Color.LinkTipFail,
Radius = (uint)Application.GetRealWidth(3),
};
topView.AddChidren(btnLinkStateTip);
@@ -131,15 +138,13 @@
topView.AddChidren(btnResidenceName);
#if DEBUG
- //鍚姩a缃戝叧mqtt
- //btnResidenceName.MouseUpEventHandler = (sender, e) =>
- //{
- // System.Threading.Tasks.Task.Run(
- // async () => { await Mqtt_A_Protocol.StartMqtt();
- // });
- //};
- btnResidenceName.MouseUpEventHandler = (sender, e) => {
- Control.SearchLocalGateway();
+ //鎼滅储缃戝叧
+ btnResidenceName.MouseUpEventHandler = (sender, e) =>
+ {
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ DriverLayer.Control.Ins.SearchLoaclGateway();
+ });
};
#endif
@@ -160,7 +165,7 @@
};
environmentalView.AddChidren(btnTempIcon);
- btnTempValues = new Button()
+ btnTempValues = new TextButton()
{
X = btnTempIcon.Right + Application.GetRealWidth(4),
Width = Application.GetRealWidth(30),
@@ -182,7 +187,7 @@
};
environmentalView.AddChidren(btnHumidityIcon);
- btnHumidityValues = new Button()
+ btnHumidityValues = new TextButton()
{
X = btnHumidityIcon.Right + Application.GetRealWidth(4),
Width = Application.GetRealWidth(30),
@@ -204,7 +209,7 @@
};
environmentalView.AddChidren(btnPm25Icon);
- btnPm25Values = new Button()
+ btnPm25Values = new TextButton()
{
X = btnPm25Icon.Right + Application.GetRealWidth(4),
Width = Application.GetRealWidth(130),
@@ -228,14 +233,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),
@@ -247,7 +252,7 @@
};
msgView.AddChidren(btnMsgIcon);
- Button btnMsg;
+
btnMsg = new Button()
{
X = Application.GetRealWidth(10) + btnMsgIcon.Right,
@@ -259,7 +264,7 @@
};
msgView.AddChidren(btnMsg);
- Button btnMsgTime;
+
btnMsgTime = new Button()
{
X = Application.GetRealWidth(299),
@@ -269,6 +274,9 @@
TextAlignment = TextAlignment.CenterLeft,
};
msgView.AddChidren(btnMsgTime);
+
+ LoadEvent_GotoMessageCenterPage();
+
#endregion
#endregion
@@ -346,6 +354,12 @@
{
MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
}
+
+
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ //DriverLayer.Control.Ins.SearchLoaclGateway();
+ });
}
/// <summary>
@@ -379,7 +393,7 @@
}
else
{
- if (!music.collection)
+ if (!music.collect)
{
continue;
}
@@ -387,7 +401,7 @@
}
else
{
- if (!function.collection)
+ if (!function.collect)
continue;
//if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
//{
@@ -475,13 +489,13 @@
try
{
int index = 0;
- foreach (var function in DB_ResidenceData.functionList.scenes)
+ foreach (var scene in DB_ResidenceData.functionList.scenes)
{
- if (!function.collection)
+ if (!scene.collect)
continue;
- if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
+ if (scene.roomIds.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
{
- function.collection = false;
+ scene.collect = false;
continue;
}
if (index % 2 == 0)
@@ -501,12 +515,12 @@
X = functionView_X,
Width = Application.GetRealWidth(164),
Height = Application.GetRealWidth(122),
- Tag = function.sid,
- BackgroundImagePath = (function as Scene).ImagePath,
+ Tag = scene.sid,
+ BackgroundImagePath = (scene as Scene).ImagePath,
};
rowView.AddChidren(functionView);
- LoadSceneFunctionDiv( functionView, function);
+ LoadSceneFunctionDiv( functionView, scene);
index++;
}
@@ -619,7 +633,7 @@
UnSelectedImagePath = "Collection/CollectionIcon.png",
};
view.AddChidren(btnCollection);
- LoadEvent_FunctionCollection(btnCollection, function, true);
+ LoadEvent_FunctionCollection(btnCollection, function);
if (function.functionCategory == FunctionCategory.Curtain)
{
@@ -697,14 +711,14 @@
btnPower.IsSelected = false;
Music.SendMethod.Pause(a31player);
a31player.A31PlayStatus.status = "pause";
- a31player.trait_on_off.value = "off";
+ a31player.trait_on_off.curValue = "off";
}
else
{
btnPower.IsSelected = true;
Music.SendMethod.Play(a31player);
a31player.A31PlayStatus.status = "play";
- a31player.trait_on_off.value = "on";
+ a31player.trait_on_off.curValue = "on";
}
UpdataFunctionStates(a31player);
};
@@ -791,7 +805,7 @@
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗鍗＄墖
/// </summary>
- void LoadSceneFunctionDiv(FrameLayout view, Function function)
+ void LoadSceneFunctionDiv(FrameLayout view, Scene scene)
{
try
{
@@ -808,7 +822,6 @@
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);
@@ -820,7 +833,7 @@
Y = Application.GetRealWidth(68),
Width = Application.GetRealWidth(150),
Height = Application.GetRealHeight(24),
- Text = function.name,
+ Text = scene.name,
TextSize = CSS_FontSize.TextFontSize,
TextColor = CSS_Color.MainBackgroundColor,
TextAlignment = TextAlignment.CenterLeft,
@@ -838,7 +851,7 @@
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
TextAlignment = TextAlignment.CenterLeft,
SelectedTextColor = CSS_Color.MainBackgroundColor,
- Text = function.GetRoomListName(),
+ Text = scene.GetRoomListName(),
};
view.AddChidren(btnZone);
@@ -854,20 +867,20 @@
UnSelectedImagePath = "Collection/CollectionIcon.png",
};
view.AddChidren(btnCollection);
- LoadEvent_FunctionCollection(btnCollection, function, false);
+ LoadEvent_SceneCollection(btnCollection, scene);
- LoadEvent_ControlScene(btnCoverd,btnName,btnZone, function);
+ LoadEvent_ControlScene(btnCoverd,btnName,btnZone, scene);
btnSettingIcon.MouseUpEventHandler = (sender, e) => {
Action backAction = () => {
//LoadSceneFunctionControlZone();
};
Action refreshAction = () => {
- btnName.Text = function.name;
- btnZone.Text = function.GetRoomListName();
- view.BackgroundImagePath = (function as Scene).ImagePath;
+ btnName.Text = scene.name;
+ btnZone.Text = scene.GetRoomListName();
+ view.BackgroundImagePath = (scene as Scene).ImagePath;
};
- var aep = new SceneEditPage(function as Scene, backAction);
+ var aep = new SceneEditPage(scene as Scene, backAction);
MainPage.BasePageView.AddChidren(aep);
aep.LoadPage(StringId.EditScene, refreshAction);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0