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 | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index 1506eb4..7198795 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -111,41 +111,40 @@
#endregion
case FunctionCategory.Curtain:
#region 绐楀笜鏇存柊
- //var uCurtain = updataFunction as Curtain;
- var percentString = updataFunction.GetAttrState(FunctionAttributeKey.Percent);
- if (percentString != null)
+ var percent = updataFunction.GetAttrState(FunctionAttributeKey.OnOff) == "off" ? 0 : 100;
+ if(updataFunction.GetAttributes().Contains(FunctionAttributeKey.Percent))
{
- int percent = 0;
+ string percentString = updataFunction.GetAttrState(FunctionAttributeKey.Percent);
int.TryParse(percentString, out percent);
- if (percent == 0)
+ }
+ if (percent == 0)
+ {
+ if (cTag == updataFunction.sid + "_off")
{
- if (cTag == updataFunction.sid + "_off")
+ try
{
- try
- {
- (fcView.GetChildren(j) as Button).IsSelected = true;
- }
- catch { }
+ (fcView.GetChildren(j) as Button).IsSelected = true;
}
- else
- {
- (fcView.GetChildren(j) as Button).IsSelected = false;
- }
+ catch { }
}
else
{
- if (cTag == updataFunction.sid + "_on")
+ (fcView.GetChildren(j) as Button).IsSelected = false;
+ }
+ }
+ else
+ {
+ if (cTag == updataFunction.sid + "_on")
+ {
+ try
{
- try
- {
- (fcView.GetChildren(j) as Button).IsSelected = true;
- }
- catch { }
+ (fcView.GetChildren(j) as Button).IsSelected = true;
}
- else
- {
- (fcView.GetChildren(j) as Button).IsSelected = false;
- }
+ catch { }
+ }
+ else
+ {
+ (fcView.GetChildren(j) as Button).IsSelected = false;
}
}
#endregion
--
Gitblit v1.8.0