From 002a3f2e9d2f9579c01f88af12bd8a320003569f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 31 三月 2020 08:57:19 +0800
Subject: [PATCH] 20200331
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 135 +++++++++++++++++++++++++--------------------
1 files changed, 75 insertions(+), 60 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index df3bb2f..bb20b61 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -55,14 +55,43 @@
LoadDiv();
- if (function.functionCategory != FunctionType.Curtain)//绐楀笜娌℃湁寮�鍏虫寜閽�
+ if (function.functionCategory == FunctionCategory.Curtain || function.functionCategory == FunctionCategory.Scene)//绐楀笜娌℃湁寮�鍏虫寜閽�
+
+ {
+ switch (function.functionCategory)
+ {
+ case FunctionCategory.Curtain:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png";
+ CurtainFragment();
+ break;
+ case FunctionCategory.Scene:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
+ if ((function as Scene).sceneType == SceneType.MovieScene)
+ {
+ var movieIcon = new Button()
+ {
+ X = Application.GetRealWidth(52),
+ Y = Application.GetRealHeight(14),
+ Width = Application.GetRealWidth(16),
+ Height = Application.GetRealWidth(16),
+ UnSelectedImagePath = "FunctionIcon/Scene/MovieMark.png",
+ };
+ bodyDiv.AddChidren(movieIcon);
+ btnName.X = Application.GetRealWidth(52 + 16);
+ }
+ //鍔犺浇鍦烘櫙鎺у埗浜嬩欢
+ LoadEvent_ControlScene();
+ break;
+ }
+ }
+ else
{
#region 鍔犺浇寮�鍏虫寜閽�
/// <summary>
/// 寮�鍏虫寜閽�
/// </summary>
Button btnSwitch;
- if (function.functionType == "RGB" || function.functionType == "Dimmer")
+ if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
{
btnSwitch = new Button()
{
@@ -72,7 +101,8 @@
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- Tag = function.functionType + "_Switch_" + function.sid
+ IsSelected = function.on_off == "on",
+ Tag = function.functionType + "_Switch_" + function.sid,
};
bodyDiv.AddChidren(btnSwitch);
}
@@ -86,57 +116,38 @@
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- Tag = function.functionType + "_Switch_" + function.sid
+ IsSelected = function.on_off == "on",
+ Tag = function.functionType + "_Switch_" + function.sid,
};
bodyDiv.AddChidren(btnSwitch);
}
//鍔犺浇寮�鍏虫寜閽簨浠�
- LoadEvent_LightSwitch(btnSwitch);
+ LoadEvent_SwitchFunction(btnSwitch);
switch (function.functionCategory)
{
- case FunctionType.AC:
+ case FunctionCategory.AC:
btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
- AcDiv();
+ LoadLastStatesButton();
break;
- case FunctionType.Light:
+ case FunctionCategory.Light:
btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
- btnSwitch.IsSelected = (function as Light).on_off == 1;
+ btnSwitch.IsSelected = function.on_off == "on";
LoadLightControl();
break;
- case FunctionType.FloorHeating:
+ case FunctionCategory.FloorHeating:
btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
- FloorHeatingDiv();
- break;
- case FunctionType.Scene:
- btnIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
- if ((function as Scene).sceneType == SceneType.MovieScene)
- {
- var movieIcon = new Button()
- {
- X = Application.GetRealWidth(52),
- Y = Application.GetRealHeight(14),
- Width = Application.GetRealWidth(16),
- Height = Application.GetRealWidth(16),
- UnSelectedImagePath = "FunctionIcon/Scene/MovieMark.png",
- };
- bodyDiv.AddChidren(movieIcon);
-
- btnName.X = movieIcon.Right;
- }
+ LoadLastStatesButton();
break;
}
#endregion
}
- else
+
+ if (function.functionCategory != FunctionCategory.Scene)
{
- btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png";
- CurtainFragment();
-
+ LoadEvent_DivSkipEvent();
}
-
- LoadEvent_DivSkipEvent();
LoadCollectionEvent();
}
@@ -149,14 +160,14 @@
{
X = Application.GetRealWidth(10),
Y = Application.GetRealHeight(15),
- Width = Application.GetMinRealAverage(32),
- Height = Application.GetMinRealAverage(32),
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
};
bodyDiv.AddChidren(btnIcon);
btnName = new Button()
{
- X = btnIcon.Right + Application.GetRealWidth(8),
+ X = Application.GetRealWidth(8 +10 + 32),
Y = Application.GetRealHeight(10),
Width = Application.GetRealWidth(200),
Height = Application.GetRealHeight(24),
@@ -169,8 +180,8 @@
btnFromFloor = new Button()
{
- X = btnIcon.Right + Application.GetRealWidth(8),
- Y = btnName.Bottom,
+ X = Application.GetRealWidth(8 + 10 + 32),
+ Y = Application.GetRealHeight(10 + 24),
Width = Application.GetRealWidth(200),
Height = Application.GetRealHeight(18),
Text = function.GetRoomListName(),
@@ -201,8 +212,8 @@
{
switch (function.functionType)
{
- case "Dimmer":
- case "RGB":
+ case FunctionType.Dimmer:
+ case FunctionType.RGB:
#region Dimmer
var btnDimmerMinValues = new Button()
{
@@ -219,14 +230,14 @@
var dimmerControlBar = new DiyImageSeekBar()
{
- X = btnDimmerMinValues.Right,
+ 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 = CSS_Color.AuxiliaryColor1,
+ ProgressBarColor = (function as Light).on_off == "on" ? CSS_Color.AuxiliaryColor1 : CSS_Color.PromptingColor2,
ProgressTextColor = CSS_Color.FirstLevelTitleColor,
ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
MaxValue = 100,
@@ -237,7 +248,7 @@
var btnDimmerMaxValues = new Button()
{
- X = dimmerControlBar.Right,
+ X = Application.GetRealWidth(14 + 22+180),
Y = Application.GetRealHeight(85),
Width = Application.GetRealWidth(35),
Height = Application.GetRealHeight(21),
@@ -268,6 +279,7 @@
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
+ Tag = function.functionType + "_off_" + function.sid
};
bodyDiv.AddChidren(btnCurtainClose);
@@ -290,30 +302,33 @@
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
+ Tag = function.functionType + "_on_" + function.sid
};
bodyDiv.AddChidren(btnCurtainOpen);
-
-
-
+ LoadEvent_ControlCurtain(btnCurtainStop, btnCurtainOpen, btnCurtainClose, function as Curtain);
#endregion
}
-
/// <summary>
- /// 鍔犺浇绌鸿皟鍔熻兘鎺у埗鍗＄墖
+ /// 鍔犺浇鍔熻兘鐘舵�佷俊鎭寜閽�
/// </summary>
- void AcDiv()
+ void LoadLastStatesButton()
{
- #region AC
- #endregion
+ var btnLastStates = new Button()
+ {
+ X = Application.GetRealWidth(10 + 32 + 8),
+ Y = Application.GetRealHeight(10 + 24 + 18),
+ Width = Application.GetRealWidth(200),
+ Height = Application.GetRealHeight(18),
+ Text = function.lastState,
+ TextAlignment = TextAlignment.CenterLeft,
+ SelectedTextColor = CSS_Color.PromptingColor1,
+ TextColor = 0x00000000,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
+ Tag = function.functionType + "_laststates_" + function.sid,
+ IsSelected = function.on_off == "on"
+ };
+ bodyDiv.AddChidren(btnLastStates);
}
- /// <summary>
- /// 鍔犺浇鍦扮儹鍔熻兘鎺у埗鍗＄墖
- /// </summary>
- void FloorHeatingDiv()
- {
- #region 鍦扮儹
- #endregion
- }
}
}
--
Gitblit v1.8.0