From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'

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

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 8f0d13f..32a9a61 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -194,7 +194,7 @@
                     }
                     break;
                 //浜轰綋瀛樺湪浼犳劅鍣�
-                case SPK.sensorPirhold:
+                case SPK.SensorPirHold:
                     {
                        
 
@@ -753,7 +753,7 @@
                     inputDevice.condition_type = "9";
                     inputDevice.identifier = this.identifier;
                 }
-                else if (device.spk == SPK.sensorPirhold)
+                else if (device.spk == SPK.SensorPirHold)
                 {
                     //浜轰綋瀛樺湪浼犳劅鍣�
                     inputDevice.hold_time = this.hold_time;
@@ -844,7 +844,7 @@
                             }
                         }
                         break;
-                    case SPK.sensorPirhold:
+                    case SPK.SensorPirHold:
                     case SPK.SensorDuiShe:
                     case SPK.SensorShanLan:
                     case SPK.SensorPir:

--
Gitblit v1.8.0