From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorGasPage.cs | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorGasPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorGasPage.cs
index ac4b459..9057d0f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorGasPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorGasPage.cs
@@ -43,7 +43,7 @@
//璇诲彇鐘舵��
new System.Threading.Thread(() =>
{
- if (device.spk == SPK.SenesorMegahealth)
+ if (device.spk == SPK.SenesorMegahealth|| device.spk == SPK.SenesorMegahealth2)
{
DriverLayer.Control.Ins.SendReadCommand(device, true);
}
@@ -118,22 +118,26 @@
/// </summary>
private void RefreshFormStatu()
{
- Application.RunOnMainThread(() => {
- foreach(var temp in device.attributes) {
- if (temp != null)
+ Application.RunOnMainThread(() =>
+ {
+ var temp = device.attributes.Find((sta) => sta.key == FunctionAttributeKey.Status);
+ if (temp == null)
+ {
+ temp = device.attributes.Find((sta) => sta.key == FunctionAttributeKey.AlarmStatus);
+ }
+ if (temp != null)
+ {
+ if (temp.state == "alarm")
{
- if (temp.state == "alarm")
- {
- btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorSmokeStateBgIconOn.png";
- btnSuctionView.TextID = StringId.InAlarm;
- btnSuctionView.IsSelected = true;
- }
- else if (temp.state == "normal")
- {
- btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/UnderProtectionBgIcon.png";
- btnSuctionView.TextID = StringId.SensorNormalState;
- btnSuctionView.IsSelected = false;
- }
+ btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorSmokeStateBgIconOn.png";
+ btnSuctionView.TextID = StringId.InAlarm;
+ btnSuctionView.IsSelected = true;
+ }
+ else if (temp.state == "normal")
+ {
+ btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/UnderProtectionBgIcon.png";
+ btnSuctionView.TextID = StringId.SensorNormalState;
+ btnSuctionView.IsSelected = false;
}
}
});
--
Gitblit v1.8.0