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 | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index 1af093e..ffd324b 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -17,14 +17,14 @@
/// <param name="updataFunction"></param>
public void UpdataStates(Function updataFunction, FrameLayout view, VerticalScrolViewLayout scrolView, Room room = null)
{
+ if (view == null || scrolView == null || updataFunction == null)
+ {
+ return;
+ }
Application.RunOnMainThread((() =>
{
try
{
- if (view == null || scrolView == null || updataFunction == null)
- {
- return;
- }
if (!scrolView.ScrollEnabled)
{
return;
@@ -112,6 +112,12 @@
{
#region 绐楀笜鏇存柊
var onoffString = updataFunction.GetAttrState(FunctionAttributeKey.OnOff);
+ var percentAttr = updataFunction.GetAttribute(FunctionAttributeKey.Percent);
+ if(percentAttr != null)
+ {
+ onoffString = percentAttr.curValue.ToString() == "0" ? "off" : "on";
+ }
+
if (onoffString == "stop")
{
return;
@@ -172,7 +178,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