From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | 75 ++++++++++++++++---------------------
1 files changed, 33 insertions(+), 42 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index 8c27dc8..7198795 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -58,6 +58,8 @@
case FunctionCategory.Light:
case FunctionCategory.AC:
case FunctionCategory.FloorHeat:
+ case FunctionCategory.Electric:
+ case FunctionCategory.AirFresh:
#region 鎸夐挳鐘舵�佹洿鏂�
if (cTag == updataFunction.sid + "_Switch")
{
@@ -76,14 +78,13 @@
{
try
{
+ (fcView.GetChildren(j) as DiyImageSeekBar).Progress = Convert.ToInt32(updataFunction.GetAttrState(FunctionAttributeKey.Brightness));
if (updataFunction.trait_on_off.curValue.ToString() == "on")
{
- (fcView.GetChildren(j) as DiyImageSeekBar).Progress = (updataFunction as Light).brightness;
(fcView.GetChildren(j) as DiyImageSeekBar).ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
}
else
{
- (fcView.GetChildren(j) as DiyImageSeekBar).Progress = (updataFunction as Light).brightness;
(fcView.GetChildren(j) as DiyImageSeekBar).ProgressBarColor = CSS.CSS_Color.PromptingColor2;
}
}
@@ -110,51 +111,41 @@
#endregion
case FunctionCategory.Curtain:
#region 绐楀笜鏇存柊
- var uCurtain = updataFunction as Curtain;
- switch (uCurtain.trait_on_off.curValue.ToString())
+ var percent = updataFunction.GetAttrState(FunctionAttributeKey.OnOff) == "off" ? 0 : 100;
+ if(updataFunction.GetAttributes().Contains(FunctionAttributeKey.Percent))
{
- case "off":
- if (cTag == updataFunction.sid + "_off")
+ string percentString = updataFunction.GetAttrState(FunctionAttributeKey.Percent);
+ int.TryParse(percentString, out percent);
+ }
+ if (percent == 0)
+ {
+ if (cTag == updataFunction.sid + "_off")
+ {
+ try
{
- try
- {
- (fcView.GetChildren(j) as Button).IsSelected = true;
- }
- catch { }
+ (fcView.GetChildren(j) as Button).IsSelected = true;
}
- else
+ catch { }
+ }
+ else
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = false;
+ }
+ }
+ else
+ {
+ if (cTag == updataFunction.sid + "_on")
+ {
+ try
{
- (fcView.GetChildren(j) as Button).IsSelected = false;
+ (fcView.GetChildren(j) as Button).IsSelected = true;
}
- break;
- case "on":
- if (cTag == updataFunction.sid + "_on")
- {
- try
- {
- (fcView.GetChildren(j) as Button).IsSelected = true;
- }
- catch { }
- }
- else
- {
- (fcView.GetChildren(j) as Button).IsSelected = false;
- }
- break;
- case "stop":
- if (cTag == updataFunction.sid + "_stop")
- {
- try
- {
- (fcView.GetChildren(j) as Button).IsSelected = true;
- }
- catch { }
- }
- else
- {
- (fcView.GetChildren(j) as Button).IsSelected = false;
- }
- break;
+ catch { }
+ }
+ else
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = false;
+ }
}
#endregion
break;
--
Gitblit v1.8.0