From 0a3167a1322f8b5f61cf0af6545e7b8ed659f5b1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 05 六月 2023 17:53:27 +0800
Subject: [PATCH] 2023年06月05日17:53:17
---
HDL_ON/Entity/Function/Function.cs | 1 -
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 14 +++++++-------
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 4 ++--
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 6 +++---
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index d597b24..171de78 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1738,7 +1738,6 @@
{
var spkList = new List<string>();
//spkList.Add(SensorLight);
- spkList.Add(sensorPirhold);
spkList.Add(SensorPir);
spkList.Add(SensorPirHold);
spkList.Add(SensorHelp);
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:
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index eb3fb05..014f3bb 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))
@@ -2074,7 +2074,7 @@
}
}
break;
- case SPK.sensorPirhold:
+ case SPK.SensorPirHold:
{
foreach (var dic in dicList)
{
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 173a736..4cd73dc 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -356,7 +356,7 @@
{
return "MusicIcon/localMusic.png";
}
- else if (SPK.SensorPm10 == device.spk || SPK.sensorPirhold == device.spk)
+ else if (SPK.SensorPm10 == device.spk || SPK.SensorPirHold == device.spk)
{
return "LogicIcon/sensor.png";
}
@@ -467,7 +467,7 @@
case SPK.SensorTVOC:
case SPK.SensorHcho:
case SPK.SensorHelp:
- case SPK.sensorPirhold:
+ case SPK.SensorPirHold:
{
strPath = "LogicIcon/sensor.png";
@@ -564,7 +564,7 @@
|| device.spk == SPK.SensorHcho
|| device.spk == SPK.SensorHelp
|| device.spk == SPK.SensorPm10
- || device.spk == SPK.sensorPirhold
+ || device.spk == SPK.SensorPirHold
);
if (sensor != null)
{
@@ -689,7 +689,7 @@
functionTypeList.Add(SPK.SensorHcho);
functionTypeList.Add(SPK.SensorHelp);
functionTypeList.Add(SPK.SensorPm10);
- functionTypeList.Add(SPK.sensorPirhold);
+ functionTypeList.Add(SPK.SensorPirHold);
}
@@ -785,7 +785,7 @@
functionTypeList.Add(SPK.SensorPm10);
functionTypeList.Add(SPK.VideoDoorLock);
functionTypeList.Add(SPK.AcIr);
- functionTypeList.Add(SPK.sensorPirhold);
+ functionTypeList.Add(SPK.SensorPirHold);
}
@@ -847,7 +847,7 @@
deviceTypeList.Add(SPK.SensorPm10);
deviceTypeList.Add(SPK.VideoDoorLock);
deviceTypeList.Add(SPK.AcIr);
- deviceTypeList.Add(SPK.sensorPirhold);
+ deviceTypeList.Add(SPK.SensorPirHold);
}
break;
@@ -1192,7 +1192,7 @@
// new Entity.Function { sid = "1234567892", name = "婀垮害浼犳劅鍣�", spk = Entity.SPK.SensorHumidity },
//new Entity.Function { sid = "12345678933456", name = "闂ㄩ攣", spk = Entity.SPK.DoorLock },
// new Entity.Function { sid = "1234567895444", name = "瑙嗛闂ㄩ攣", spk = Entity.SPK.VideoDoorLock },
- new Entity.Function { sid = "12345678968888", name = "浜轰綋瀛樺湪浼犳劅鍣�", spk = Entity.SPK.sensorPirhold },
+ new Entity.Function { sid = "12345678968888", name = "浜轰綋瀛樺湪浼犳劅鍣�", spk = Entity.SPK.SensorPirHold },
// new Entity.Function { sid = "1234567897", name = "姣背娉紶鎰熷櫒1", spk = Entity.SPK.SenesorMegahealth2 },
// new Entity.Function { sid = "1234567899", name = "闂ㄧ浼犳劅鍣�", spk = Entity.SPK.SensorDoorWindow },
// new Entity.Function { sid = "12345678991234", name = "HDL鏈烘鎵�", spk = Entity.SPK.MechanicalArm },
--
Gitblit v1.8.0