From b47f91b91bc5371bba0c8801dbd648772ab331fc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十一月 2022 13:54:15 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index 04c68ec..69e0702 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -112,10 +112,10 @@
{
#region 绐楀笜鏇存柊
var onoffString = updataFunction.GetAttrState(FunctionAttributeKey.OnOff);
- if (onoffString == "stop")
- {
- return;
- }
+ //if (onoffString == "stop")
+ //{
+ // return;
+ //}
var percent = onoffString == "off" ? 0 : 100;
if (updataFunction.GetAttributes().Contains(FunctionAttributeKey.Percent))
{
@@ -172,7 +172,7 @@
#endregion
}
//鏇存柊姣背娉紶鎰熷櫒鐘舵��
- else if(SPK.SenesorMegahealth == updataFunction.spk)
+ else if(SPK.SenesorMegahealth == updataFunction.spk || SPK.SensorMmvPose == updataFunction.spk)
{
if (cTag == updataFunction.sid + "_SenesorMegahealth_Status")
{
--
Gitblit v1.8.0