From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index 1506eb4..32ef478 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -18,7 +18,6 @@
{
Application.RunOnMainThread((Action)(() =>
{
-
try
{
if (view == null || scrolView == null || updataFunction == null)
@@ -111,41 +110,45 @@
#endregion
case FunctionCategory.Curtain:
#region 绐楀笜鏇存柊
- //var uCurtain = updataFunction as Curtain;
- var percentString = updataFunction.GetAttrState(FunctionAttributeKey.Percent);
- if (percentString != null)
+ var onoffString = updataFunction.GetAttrState(FunctionAttributeKey.OnOff);
+ if (onoffString == "stop")
{
- int percent = 0;
+ return;
+ }
+ var percent = onoffString == "off" ? 0 : 100;
+ if(updataFunction.GetAttributes().Contains(FunctionAttributeKey.Percent))
+ {
+ 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