From b69d7735274b8d0f741da8a6bb8b8e1347477a5a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 19 三月 2020 17:14:16 +0800
Subject: [PATCH] 20200319
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 113 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 63 insertions(+), 50 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/Room/FunctionDiv.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
similarity index 75%
rename from HDL_ON/UI/UI2/2-Classification/Room/FunctionDiv.cs
rename to HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 5ac737b..df3bb2f 100644
--- a/HDL_ON/UI/UI2/2-Classification/Room/FunctionDiv.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -5,7 +5,7 @@
namespace HDL_ON.UI
{
- public partial class RoomControlZone : FrameLayout
+ public partial class FunctionControlZone : FrameLayout
{
#region 鍖哄煙鎺т欢
FrameLayout bodyDiv;
@@ -30,10 +30,16 @@
#region 鍖哄煙鍙橀噺
Function function;
#endregion
- public RoomControlZone(Function func)
+ public FunctionControlZone(Function func)
{
bodyDiv = this;
function = func;
+ }
+
+ public override void RemoveFromParent()
+ {
+ base.RemoveFromParent();
+ bodyDiv = null;
}
/// <summary>
@@ -49,9 +55,9 @@
LoadDiv();
- #region 鍔犺浇寮�鍏虫寜閽�
if (function.functionCategory != FunctionType.Curtain)//绐楀笜娌℃湁寮�鍏虫寜閽�
{
+ #region 鍔犺浇寮�鍏虫寜閽�
/// <summary>
/// 寮�鍏虫寜閽�
/// </summary>
@@ -66,6 +72,7 @@
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
+ Tag = function.functionType + "_Switch_" + function.sid
};
bodyDiv.AddChidren(btnSwitch);
}
@@ -79,49 +86,54 @@
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
+ Tag = function.functionType + "_Switch_" + function.sid
};
bodyDiv.AddChidren(btnSwitch);
}
//鍔犺浇寮�鍏虫寜閽簨浠�
LoadEvent_LightSwitch(btnSwitch);
- }
- #endregion
- switch (function.functionCategory)
- {
- case FunctionType.AC:
- btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
- AcDiv(bodyDiv);
- break;
- case FunctionType.Curtain:
- btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png";
- CurtainFragment(bodyDiv);
- break;
- case FunctionType.Light:
- btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
- LoadLightcontrol(bodyDiv);
- break;
- case FunctionType.FloorHeating:
- btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
- FloorHeatingDiv(bodyDiv);
- break;
- case FunctionType.Scene:
- btnIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
- if ((function as Scene).sceneType == SceneType.MovieScene)
- {
- var movieIcon = new Button()
+ switch (function.functionCategory)
+ {
+ case FunctionType.AC:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
+ AcDiv();
+ break;
+ case FunctionType.Light:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
+ btnSwitch.IsSelected = (function as Light).on_off == 1;
+ LoadLightControl();
+ break;
+ case FunctionType.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)
{
- X = Application.GetRealWidth(52),
- Y = Application.GetRealHeight(14),
- Width = Application.GetRealWidth(16),
- Height = Application.GetRealWidth(16),
- UnSelectedImagePath = "FunctionIcon/Scene/MovieMark.png",
- };
- bodyDiv.AddChidren(movieIcon);
+ 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;
- }
- break;
+ btnName.X = movieIcon.Right;
+ }
+ break;
+ }
+
+ #endregion
+ }
+ else
+ {
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png";
+ CurtainFragment();
+
}
LoadEvent_DivSkipEvent();
@@ -185,7 +197,7 @@
/// <summary>
/// 鍔犺浇鐏厜鍔熻兘鎺у埗鍗＄墖
/// </summary>
- void LoadLightcontrol(FrameLayout view)
+ void LoadLightControl()
{
switch (function.functionType)
{
@@ -203,7 +215,7 @@
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
};
- view.AddChidren(btnDimmerMinValues);
+ bodyDiv.AddChidren(btnDimmerMinValues);
var dimmerControlBar = new DiyImageSeekBar()
{
@@ -218,9 +230,10 @@
ProgressTextColor = CSS_Color.FirstLevelTitleColor,
ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
MaxValue = 100,
- Progress = 30,
+ Progress = (function as Light).brightness,
+ Tag = function.functionType + "_DimmerBar_" + function.sid
};
- view.AddChidren(dimmerControlBar);
+ bodyDiv.AddChidren(dimmerControlBar);
var btnDimmerMaxValues = new Button()
{
@@ -233,7 +246,7 @@
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
};
- view.AddChidren(btnDimmerMaxValues);
+ bodyDiv.AddChidren(btnDimmerMaxValues);
//鍔犺浇璋冨厜浜嬩欢
LoadEvent_LightDimming(dimmerControlBar);
#endregion
@@ -244,7 +257,7 @@
/// <summary>
/// 鍔犺浇绐楀笜鍔熻兘鎺у埗鍗＄墖
/// </summary>
- void CurtainFragment(FrameLayout view)
+ void CurtainFragment()
{
#region Curtain
var btnCurtainClose = new Button()
@@ -256,7 +269,7 @@
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
};
- view.AddChidren(btnCurtainClose);
+ bodyDiv.AddChidren(btnCurtainClose);
var btnCurtainStop = new Button()
{
@@ -267,7 +280,7 @@
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainStopIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainStopOnIcon.png",
};
- view.AddChidren(btnCurtainStop);
+ bodyDiv.AddChidren(btnCurtainStop);
var btnCurtainOpen = new Button()
{
@@ -278,9 +291,9 @@
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
};
- view.AddChidren(btnCurtainOpen);
+ bodyDiv.AddChidren(btnCurtainOpen);
-
+
#endregion
}
@@ -288,7 +301,7 @@
/// <summary>
/// 鍔犺浇绌鸿皟鍔熻兘鎺у埗鍗＄墖
/// </summary>
- void AcDiv(FrameLayout view)
+ void AcDiv()
{
#region AC
#endregion
@@ -297,7 +310,7 @@
/// <summary>
/// 鍔犺浇鍦扮儹鍔熻兘鎺у埗鍗＄墖
/// </summary>
- void FloorHeatingDiv(FrameLayout view)
+ void FloorHeatingDiv()
{
#region 鍦扮儹
#endregion
--
Gitblit v1.8.0