From 387383a243879bf8c63a4611e2ed2c5a519e218d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 十一月 2020 18:14:29 +0800
Subject: [PATCH] Merge branch 'CJL'
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 204 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 169 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 336b3c3..cba96cc 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.MainColor,
+ 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,18 @@
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.ChangeCommunicationMode(DriverLayer.CommunicationMode.local_BusUdp);
+ UdpSocket._BusSocket.SearchNetDeviceAction = (revIp) =>
+ {
+ MainPage.Log($"鎼滅储鍒扮綉缁滆澶囷細{revIp}");
+ };
+ DriverLayer.Control.ins.myUdp.ReadGatewayIP();
+ });
};
#endif
@@ -188,7 +210,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,
@@ -211,7 +233,7 @@
var btngb = new Button()
{
- BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,//
+ BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,
Alpha = 0.4f,
};
msgView.AddChidren(btngb);
@@ -320,7 +342,6 @@
contentView.PageIndex = 0;
#endregion
- bodyView.AddChidren(new Button() { Y = changeView.Bottom, Height = Application.GetRealHeight(4), BackgroundColor = 0xAAF2F3F7 });
LoadEvent_ChangeShowedFunctionType();
}
@@ -342,14 +363,40 @@
try
{
int index = 0;
- foreach (var function in DB_ResidenceData.residenceData.functionList.GetAllDeviceFunctionList())
+ foreach (var function in DB_ResidenceData.functionList.GetAllDeviceFunctionList())
{
- if (!function.collection)
- continue;
- if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
+ //闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
+ if (function.functionCategory == FunctionCategory.Music)
{
- function.collection = false;
- continue;
+ var music = function as Music.A31MusicModel;
+ if (music.ServerClientType == -1)
+ {
+ continue;
+ }
+ else if (music.ServerClientType == 1)
+ {
+ if (!music.MainPlayCollection)
+ {
+ continue;
+ }
+ }
+ else
+ {
+ if (!music.collection)
+ {
+ continue;
+ }
+ }
+ }
+ else
+ {
+ if (!function.collection)
+ continue;
+ //if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
+ //{
+ // function.collection = false;
+ // continue;
+ //}
}
if (index % 2 == 0)
{
@@ -373,6 +420,7 @@
Tag = function.sid
};
rowView.AddChidren(functionView);
+
var btnbg = new Button()
{
UnSelectedImagePath = "Collection/Functionbg.png",
@@ -407,7 +455,7 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextID = StringId.TipNoCollcetion,
+ TextID = StringId.TipNoFunctionCollcetion,
};
view.AddChidren(btnNoCollectionTip);
}
@@ -430,7 +478,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;
@@ -465,6 +513,32 @@
index++;
}
+ if (index == 0)
+ {
+ var view = new FrameLayout();
+ sceneFunctionView.AddChidren(view);
+
+ var btnNoCollectionBg = new Button()
+ {
+ Y = Application.GetRealHeight(20),
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(180),
+ Height = Application.GetRealWidth(180),
+ UnSelectedImagePath = "Collection/NoCollectionBg.png",
+ };
+ view.AddChidren(btnNoCollectionBg);
+
+ var btnNoCollectionTip = new Button()
+ {
+ Height = Application.GetRealHeight(42),
+ Y = btnNoCollectionBg.Bottom,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextID = StringId.TipNoSceneCollcetion,
+ };
+ view.AddChidren(btnNoCollectionTip);
+ }
}
catch (Exception ex)
{
@@ -579,7 +653,9 @@
view.AddChidren(btnCurtainOpen);
LoadEvent_ControlCurtain(function as Curtain, btnCurtainClose, btnCurtainOpen);
- }else if(function.functionType== FunctionType.TV)
+ }
+
+ else if (function.functionType == FunctionType.TV)
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVIcon.png";
Button btnPower;
@@ -594,6 +670,49 @@
view.AddChidren(btnPower);
LoadEvent_ControlTV(function as TV, btnPower);
}
+
+ else if (function.functionCategory == FunctionCategory.Music)
+ {
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/Music/MusicOnIcon.png";
+ Button btnPower;
+ btnPower = new Button()
+ {
+ X = Application.GetRealWidth(118),
+ Y = Application.GetRealWidth(83),
+ Width = Application.GetRealWidth(44),
+ Height = Application.GetRealWidth(44),
+ UnSelectedImagePath = "FunctionIcon/Music/MusicPlayIcon.png",
+ SelectedImagePath = "FunctionIcon/Music/MusicPlayOnIcon.png",
+ };
+ view.AddChidren(btnPower);
+ var a31player = (function as UI.Music.A31MusicModel);
+ btnState.Text = a31player.A31PlayStatus.Title;
+
+ btnState.SelectedTextColor = CSS_Color.MainBackgroundColor;
+ btnState.TextColor = CSS_Color.MainBackgroundColor;//PromptingColor1
+
+ //Music.SendMethod.ReadStatus(a31player);
+
+ btnPower.MouseUpEventHandler = (sender, e) => {
+ if (btnPower.IsSelected)
+ {
+ btnPower.IsSelected = false;
+ Music.SendMethod.Pause(a31player);
+ a31player.A31PlayStatus.status = "pause";
+ a31player.trait_on_off.value = "off";
+ }
+ else
+ {
+ btnPower.IsSelected = true;
+ Music.SendMethod.Play(a31player);
+ a31player.A31PlayStatus.status = "play";
+ a31player.trait_on_off.value = "on";
+ }
+ UpdataFunctionStates(a31player);
+ };
+ }
+
else
{
Button btnSwitch;
@@ -644,7 +763,7 @@
}
break;
case FunctionCategory.Electrical:
- switch(function.functionType)
+ switch (function.functionType)
{
case FunctionType.Fan:
btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanIcon.png";
@@ -672,7 +791,6 @@
}
}
-
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗鍗＄墖
/// </summary>
@@ -680,6 +798,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()
{
@@ -709,22 +845,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()
@@ -739,8 +859,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