From 203c3a3ffde6259413d9743f6a723b95b1e7989c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 06 七月 2023 22:43:05 +0800
Subject: [PATCH] 门锁功能

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index eb3fb05..430bd42 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -467,7 +467,7 @@
 
                                     }
                                     break;
-                                case SPK.sensorPirhold:
+                                case SPK.SensorPirHold:
                                     {
                                         string value = this.GetKeyValue("people_status", dicList);
                                         if (string.IsNullOrEmpty(value))
@@ -1170,8 +1170,8 @@
 
                                         if (set_temp != "")
                                         {
-
-                                            stateStr += set_temp + "鈩�,";
+                                            string unit = device.GetAttribute("temperature_type") == null ? "掳" : device.GetAttribute("temperature_type").state;
+                                            stateStr += set_temp + unit+",";
                                         }
 
                                         if (mode != "")
@@ -1268,8 +1268,8 @@
                                         }
                                         if (set_temp != "")
                                         {
-
-                                            stateStr += set_temp + "鈩�,";
+                                            string unit = device.GetAttribute("temperature_type") == null ? "掳" : device.GetAttribute("temperature_type").state;
+                                            stateStr += set_temp + unit + ",";
                                         }
                                         if (mode != "")
                                         {
@@ -2074,7 +2074,7 @@
                         }
                     }
                     break;
-                case SPK.sensorPirhold:
+                case SPK.SensorPirHold:
                     {
                         foreach (var dic in dicList)
                         {

--
Gitblit v1.8.0