From f718d23a262a5a8e1241fdeaeb4153399f95e79d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 21 四月 2020 09:19:05 +0800
Subject: [PATCH] 20200421
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index bb20b61..a515748 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)
{
@@ -56,7 +60,6 @@
if (function.functionCategory == FunctionCategory.Curtain || function.functionCategory == FunctionCategory.Scene)//绐楀笜娌℃湁寮�鍏虫寜閽�
-
{
switch (function.functionCategory)
{
@@ -126,18 +129,23 @@
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";
+ 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();
break;
}
@@ -148,7 +156,7 @@
{
LoadEvent_DivSkipEvent();
}
- LoadCollectionEvent();
+ LoadEvent_FunctionCollection();
}
/// <summary>
--
Gitblit v1.8.0