From db45c85a6ddebc5018b32a9d9dc04f839db3fa76 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 28 九月 2021 15:59:34 +0800
Subject: [PATCH] 组合调光

---
 HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorGasPage.cs |   34 +++++++++++++++++++---------------
 1 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorGasPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorGasPage.cs
index 109084a..9057d0f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorGasPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmSensor/SensorGasPage.cs
@@ -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