From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 65 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 3d834a2..51edfaf 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
+using HDL_ON.UI.Music;
using Shared;
namespace HDL_ON.UI
@@ -58,14 +59,17 @@
}
LoadDiv();
-
- if (function.functionCategory == FunctionCategory.Curtain || function.functionCategory == FunctionCategory.Scene)//绐楀笜娌℃湁寮�鍏虫寜閽�
+ if (function.functionCategory == FunctionCategory.Curtain || function.functionCategory == FunctionCategory.Music || function.functionCategory == FunctionCategory.Scene)//绐楀笜娌℃湁寮�鍏虫寜閽�
{
switch (function.functionCategory)
{
case FunctionCategory.Curtain:
btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png";
CurtainFragment();
+ break;
+ case FunctionCategory.Music:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicThinIcon.png";
+ MusicFragment();
break;
case FunctionCategory.Scene:
btnIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
@@ -133,7 +137,7 @@
switch (function.functionType)
{
case FunctionType.AC:
- btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
+ btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png";
LoadLastStatesButton();
break;
case FunctionType.FloorHeating:
@@ -169,9 +173,6 @@
btnSwitch.IsSelected = function.on_off == "on";
break;
}
-
-
-
#endregion
}
@@ -233,7 +234,6 @@
IsSelected = function.collection
};
bodyDiv.AddChidren(btnCollectionIcon);
-
}
/// <summary>
@@ -261,7 +261,7 @@
var dimmerControlBar = new DiyImageSeekBar()
{
- X = Application.GetRealWidth(14+ 22),
+ X = Application.GetRealWidth(14 + 22),
Y = Application.GetRealHeight(68),//91,璁捐鏁版嵁
Width = Application.GetRealWidth(180),
Height = Application.GetRealHeight(54),
@@ -339,6 +339,52 @@
LoadEvent_ControlCurtain(btnCurtainStop, btnCurtainOpen, btnCurtainClose, function as Curtain);
#endregion
}
+
+ /// <summary>
+ /// 鍔犺浇闊充箰鍔熻兘鎺у埗鍗＄墖
+ /// </summary>
+ void MusicFragment()
+ {
+ #region Music
+ var btnPrev = new Button()
+ {
+ X = Application.GetRealWidth(163),
+ Y = Application.GetRealHeight(58),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
+ UnSelectedImagePath = "MusicIcon/prev.png",
+ SelectedImagePath = "MusicIcon/prevSeletced.png",
+ };
+ bodyDiv.AddChidren(btnPrev);
+
+ var btnPlay = new Button()
+ {
+ X = Application.GetRealWidth(233),
+ Y = Application.GetRealHeight(58),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
+ UnSelectedImagePath = "MusicIcon/pause.png",
+ SelectedImagePath = "MusicIcon/play.png",
+ IsSelected = (function as A31MusicModel).A31PlayStatus.status == "play" ,
+ Tag = function.functionType + "_State_" + function.sid
+ };
+ bodyDiv.AddChidren(btnPlay);
+
+ var btnNext = new Button()
+ {
+ X = Application.GetRealWidth(303),
+ Y = Application.GetRealHeight(58),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
+ UnSelectedImagePath = "MusicIcon/next.png",
+ SelectedImagePath = "MusicIcon/nextSelected.png",
+ };
+ bodyDiv.AddChidren(btnNext);
+ LoadEvent_ControlMusic(btnPlay, btnNext, btnPrev, function as A31MusicModel);
+ #endregion
+ }
+
+
/// <summary>
/// 鍔犺浇鍔熻兘鐘舵�佷俊鎭寜閽�
/// </summary>
@@ -360,6 +406,5 @@
};
bodyDiv.AddChidren(btnLastStates);
}
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0