From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 123 ++++++++++++++++++++++++++++++++++------
1 files changed, 104 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 0ff0258..97d9500 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
@@ -8,7 +9,7 @@
public partial class FunctionControlZone : FrameLayout
{
#region 鍖哄煙鎺т欢
- FrameLayout bodyDiv;
+ static FrameLayout bodyDiv;
/// <summary>
/// 鍔熻兘/鍦烘櫙icon
/// </summary>
@@ -29,10 +30,15 @@
#region 鍖哄煙鍙橀噺
Function function;
+ /// <summary>
+ /// 鏄惁鍦ㄨ皟鍏�
+ /// </summary>
+ bool onDimmerBar;
#endregion
public FunctionControlZone(Function func)
{
bodyDiv = this;
+ bodyDiv.Tag = func.sid;
function = func;
}
@@ -54,14 +60,28 @@
}
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";
+ switch(function.functionType)
+ {
+ case FunctionType.Curtain:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png";
+ break;
+ case FunctionType.MotorCurtain:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/MotorCurtainIcon.png";
+ break;
+ case FunctionType.RollingShutter:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/RollingShutterIcon.png";
+ break;
+ }
CurtainFragment();
+ break;
+ case FunctionCategory.Music:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicThinIcon.png";
+ MusicFragment();
break;
case FunctionCategory.Scene:
btnIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
@@ -100,8 +120,8 @@
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = function.on_off == "on",
- Tag = function.functionType + "_Switch_" + function.sid,
+ IsSelected = function.trait_on_off.value.ToString() == "on",
+ Tag = function.sid + "_Switch",
};
bodyDiv.AddChidren(btnSwitch);
}
@@ -115,8 +135,8 @@
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = function.on_off == "on",
- Tag = function.functionType + "_Switch_" + function.sid,
+ IsSelected = function.trait_on_off.value.ToString() == "on",
+ Tag = function.sid + "_Switch",
};
bodyDiv.AddChidren(btnSwitch);
}
@@ -129,7 +149,7 @@
switch (function.functionType)
{
case FunctionType.AC:
- btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
+ btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png";
LoadLastStatesButton();
break;
case FunctionType.FloorHeating:
@@ -140,11 +160,31 @@
break;
case FunctionCategory.Light:
btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
- btnSwitch.IsSelected = function.on_off == "on";
+ btnSwitch.IsSelected = function.trait_on_off.value.ToString() == "on";
LoadLightControl();
break;
+ case FunctionCategory.SwitchDevice:
+ switch (function.functionType)
+ {
+ case FunctionType.Socket:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png";
+ break;
+ }
+ btnSwitch.IsSelected = function.trait_on_off.value.ToString() == "on";
+ break;
+ case FunctionCategory.Electrical:
+ switch (function.functionType)
+ {
+ case FunctionType.Fan:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanThinIcon.png";
+ break;
+ case FunctionType.TV:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png";
+ break;
+ }
+ btnSwitch.IsSelected = function.trait_on_off.value.ToString() == "on";
+ break;
}
-
#endregion
}
@@ -206,7 +246,6 @@
IsSelected = function.collection
};
bodyDiv.AddChidren(btnCollectionIcon);
-
}
/// <summary>
@@ -234,19 +273,20 @@
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),
SeekBarViewHeight = Application.GetRealHeight(8),
ThumbImagePath = "Public/ThumbImage.png",
ThumbImageHeight = Application.GetRealHeight(54),
- ProgressBarColor = (function as Light).on_off == "on" ? CSS_Color.AuxiliaryColor1 : CSS_Color.PromptingColor2,
+ ProgressBarColor = function.trait_on_off.value.ToString() == "on" ? CSS_Color.AuxiliaryColor1 : CSS_Color.PromptingColor2,
ProgressTextColor = CSS_Color.FirstLevelTitleColor,
- ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ ProgressTextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
MaxValue = 100,
Progress = (function as Light).brightness,
- Tag = function.functionType + "_DimmerBar_" + function.sid
+ Tag = function.sid + "_DimmerBar",
+ SeekBarPadding = Application.GetRealWidth(20),
};
bodyDiv.AddChidren(dimmerControlBar);
@@ -312,6 +352,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>
@@ -329,10 +415,9 @@
TextColor = 0x00000000,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
Tag = function.functionType + "_laststates_" + function.sid,
- IsSelected = function.on_off == "on"
+ IsSelected = function.trait_on_off.value.ToString() == "on"
};
bodyDiv.AddChidren(btnLastStates);
}
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0