From 4796f4a91d85dedb5a30d2f5d3844c5720f5919a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 13 五月 2022 17:36:46 +0800
Subject: [PATCH] 2022年05月13日17:36:43
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 8185dc9..aa40d9a 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -76,7 +76,8 @@
{//闊充箰娌℃湁寮�鍏虫寜閽�
MusicFragment();
}
- else if (SPK.EvironmentSensorList().Contains(function.spk) || SPK.ArmSensorSpkList().Contains(function.spk)) //浼犳劅鍣ㄦ病鏈夊紑鍏虫寜閽�)
+ else if (SPK.EvironmentSensorList().Contains(function.spk) || SPK.ArmSensorSpkList().Contains(function.spk)
+ || SPK.PanelSpkList().Contains(function.spk)) //浼犳劅鍣ㄦ病鏈夊紑鍏虫寜閽�)
{
var powerLowTipAttr = function.attributes.Find((obj) => obj.key == FunctionAttributeKey.BatteryState);
if (powerLowTipAttr != null)
@@ -230,21 +231,21 @@
bodyDiv.AddChidren(btnCollectionIcon);
}
- if (!function.online)
- {
- bodyDiv.BackgroundColor = CSS_Color.PromptingColor2;
- btnOffline = new Button()
- {
- X = Application.GetRealWidth(8 + 10 + 32),
- Y = Application.GetRealHeight(28 + 24),
- Height = Application.GetRealHeight(30),
- TextID = StringId.DeviceOffline,
- TextColor = CSS_Color.WarningColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextAlignment = TextAlignment.CenterLeft
- };
- bodyDiv.AddChidren(btnOffline);
- }
+ //if (!function.online)
+ //{
+ // bodyDiv.BackgroundColor = CSS_Color.PromptingColor2;
+ // btnOffline = new Button()
+ // {
+ // X = Application.GetRealWidth(8 + 10 + 32),
+ // Y = Application.GetRealHeight(28 + 24),
+ // Height = Application.GetRealHeight(30),
+ // TextID = StringId.DeviceOffline,
+ // TextColor = CSS_Color.WarningColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // TextAlignment = TextAlignment.CenterLeft
+ // };
+ // bodyDiv.AddChidren(btnOffline);
+ //}
}
/// <summary>
--
Gitblit v1.8.0