From 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 26 七月 2023 15:55:30 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index 69e0702..ffd324b 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -112,10 +112,16 @@
{
#region 绐楀笜鏇存柊
var onoffString = updataFunction.GetAttrState(FunctionAttributeKey.OnOff);
- //if (onoffString == "stop")
- //{
- // return;
- //}
+ var percentAttr = updataFunction.GetAttribute(FunctionAttributeKey.Percent);
+ if(percentAttr != null)
+ {
+ onoffString = percentAttr.curValue.ToString() == "0" ? "off" : "on";
+ }
+
+ if (onoffString == "stop")
+ {
+ return;
+ }
var percent = onoffString == "off" ? 0 : 100;
if (updataFunction.GetAttributes().Contains(FunctionAttributeKey.Percent))
{
--
Gitblit v1.8.0