From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index bb20b61..15e5461 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -29,6 +29,10 @@
#region 鍖哄煙鍙橀噺
Function function;
+ /// <summary>
+ /// 鏄惁鍦ㄨ皟鍏�
+ /// </summary>
+ bool onDimmerBar;
#endregion
public FunctionControlZone(Function func)
{
@@ -54,9 +58,7 @@
}
LoadDiv();
-
if (function.functionCategory == FunctionCategory.Curtain || function.functionCategory == FunctionCategory.Scene)//绐楀笜娌℃湁寮�鍏虫寜閽�
-
{
switch (function.functionCategory)
{
@@ -126,21 +128,47 @@
switch (function.functionCategory)
{
- case FunctionCategory.AC:
- btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
- LoadLastStatesButton();
+ case FunctionCategory.Thermostat:
+ switch (function.functionType)
+ {
+ case FunctionType.AC:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
+ LoadLastStatesButton();
+ break;
+ case FunctionType.FloorHeating:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
+ LoadLastStatesButton();
+ break;
+ }
break;
case FunctionCategory.Light:
btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
btnSwitch.IsSelected = function.on_off == "on";
LoadLightControl();
break;
- case FunctionCategory.FloorHeating:
- btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
- LoadLastStatesButton();
+ case FunctionCategory.SwitchDevice:
+ switch (function.functionType)
+ {
+ case FunctionType.Socket:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png";
+ break;
+ }
+ btnSwitch.IsSelected = function.on_off == "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.on_off == "on";
break;
}
-
#endregion
}
@@ -148,7 +176,7 @@
{
LoadEvent_DivSkipEvent();
}
- LoadCollectionEvent();
+ LoadEvent_FunctionCollection();
}
/// <summary>
@@ -202,7 +230,6 @@
IsSelected = function.collection
};
bodyDiv.AddChidren(btnCollectionIcon);
-
}
/// <summary>
@@ -230,7 +257,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),
@@ -329,6 +356,5 @@
};
bodyDiv.AddChidren(btnLastStates);
}
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0