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 | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index a515748..15e5461 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -58,7 +58,6 @@
}
LoadDiv();
-
if (function.functionCategory == FunctionCategory.Curtain || function.functionCategory == FunctionCategory.Scene)//绐楀笜娌℃湁寮�鍏虫寜閽�
{
switch (function.functionCategory)
@@ -134,6 +133,7 @@
{
case FunctionType.AC:
btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
+ btnIcon.SelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
LoadLastStatesButton();
break;
case FunctionType.FloorHeating:
@@ -147,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
}
@@ -210,7 +230,6 @@
IsSelected = function.collection
};
bodyDiv.AddChidren(btnCollectionIcon);
-
}
/// <summary>
@@ -238,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),
@@ -337,6 +356,5 @@
};
bodyDiv.AddChidren(btnLastStates);
}
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0