From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45
---
HDL_ON/Entity/Function/SecurityAlarm.cs | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/Entity/Function/SecurityAlarm.cs b/HDL_ON/Entity/Function/SecurityAlarm.cs
index ea29373..1ddb0b9 100644
--- a/HDL_ON/Entity/Function/SecurityAlarm.cs
+++ b/HDL_ON/Entity/Function/SecurityAlarm.cs
@@ -33,6 +33,10 @@
/// </summary>
public string delay ="0";
/// <summary>
+ /// 鎶ヨ寤舵椂
+ /// </summary>
+ public string output_delay = "0";
+ /// <summary>
/// 鐘舵��
/// 甯冮槻:enable
/// 鎾掗槻:disable
@@ -272,9 +276,9 @@
/// </summary>
public string sid;
/// <summary>
- /// Bypass璁剧疆 true:鍚敤涓�乫alse:涓存椂bypass涓�
+ /// Bypass璁剧疆 false:鍚敤涓�乼rue:涓存椂bypass涓�
/// </summary>
- public string bypass;
+ public string bypass = "false";
/// <summary>
/// 瀹夐槻杈撳叆鏉′欢
/// </summary>
@@ -332,6 +336,7 @@
}
break;
case SPK.SensorPir:
+ case SPK.SensorPirHold:
if (inputValue == "true")
{
text += Language.StringByID(StringId.youren) + " ";
@@ -390,6 +395,7 @@
}
break;
case SPK.SensorPir:
+ case SPK.SensorPirHold:
foreach (var con in condition)
{
if (con.value == "true")
@@ -457,6 +463,10 @@
/// 鍊�
/// </summary>
public string value;
+ /// <summary>
+ /// Bypass璁剧疆 true:涓存椂bypass涓�乫alse:鍚敤涓�
+ /// </summary>
+ public bool bypass = false;
}
/// <summary>
@@ -466,11 +476,11 @@
{
/// <summary>
/// 鎺у埗鐩爣绫诲瀷
- /// 0:璁惧
- /// 1:鍦烘櫙
- /// 2:鑷姩鍖�
+ /// 1:璁惧
+ /// 2:鍦烘櫙
+ /// 3:鑷姩鍖�
/// </summary>
- public string target_type = "0";
+ public string target_type = "1";
/// <summary>
/// 杈撳嚭鐩爣鐨剆id
/// </summary>
@@ -483,7 +493,7 @@
/// <summary>
/// 鏈湴涓嶅瓨鍦ㄦ暟鎹紙鏁版嵁鍙兘琚垹浜嗭級
/// </summary>
- public bool NoLocalData ()
+ public bool LocalData ()
{
var function = FunctionList.List.GetLightList().Find((obj) => obj.sid == sid);
if (function != null)
@@ -592,7 +602,7 @@
public string StateText()
{
string text = "";
- if (target_type == "0")
+ if (target_type == "1")
{
switch (spk)
{
@@ -627,7 +637,7 @@
}
break;
}
- }else if(target_type == "1")
+ }else if(target_type == "2")
{
text = Language.StringByID(StringId.Open);
}
--
Gitblit v1.8.0