From a499dceb02f181e64956431ed0c682dd7d2ce7d7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 04 八月 2020 17:45:20 +0800
Subject: [PATCH] 2020-08-04-1
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 0ff0258..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)
{
@@ -53,7 +57,6 @@
return;
}
LoadDiv();
-
if (function.functionCategory == FunctionCategory.Curtain || function.functionCategory == FunctionCategory.Scene)//绐楀笜娌℃湁寮�鍏虫寜閽�
{
@@ -130,6 +133,7 @@
{
case FunctionType.AC:
btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
LoadLastStatesButton();
break;
case FunctionType.FloorHeating:
@@ -143,8 +147,28 @@
btnSwitch.IsSelected = function.on_off == "on";
LoadLightControl();
break;
+ 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
}
@@ -206,7 +230,6 @@
IsSelected = function.collection
};
bodyDiv.AddChidren(btnCollectionIcon);
-
}
/// <summary>
@@ -234,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),
@@ -333,6 +356,5 @@
};
bodyDiv.AddChidren(btnLastStates);
}
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0