From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
index d643f14..19c31ea 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
@@ -50,6 +50,10 @@
/// </summary>
public List<Output> output = new List<Output>();
/// <summary>
+ /// 閫氱煡閰嶇疆
+ /// </summary>
+ public NoticeConfig noticeConfig = new NoticeConfig();
+ /// <summary>
/// 鎺ㄩ�侀厤缃�
/// </summary>
public List<PushConfigs> pushConfigs = new List<PushConfigs>();
@@ -89,6 +93,8 @@
/// 浜戠澶╂皵鏉′欢=6;
/// 鏌愪釜閫昏緫/鍦烘櫙鐨勮緭鍑烘潯浠�=7;
/// 鍦扮悊鍥存爮=8;
+ /// 绌烘皵璐ㄩ噺=9;
+ /// 鍦烘櫙=10;
/// </summary>
public string condition_type = "";
public List<Dictionary<string, string>> condition = new List<Dictionary<string, string>>();
@@ -108,10 +114,15 @@
/// </summary>
public string sid = "";
/// <summary>
+ /// 閫昏緫杈撳嚭鐩爣寤舵椂闂�(鍗曚綅鐢ㄧ)
+ /// </summary>
+ public string delay = "0";
+ /// <summary>
/// 閫昏緫杈撳嚭鐩爣绫诲瀷
/// 璁惧=1;
/// 鍦烘櫙=2;
- /// 寤舵椂=3;
+ /// 瀹夐槻=3;
+ /// 寤舵椂=4;
/// </summary>
public string target_type = "";
public List<Dictionary<string, string>> status = new List<Dictionary<string, string>>();
@@ -136,6 +147,21 @@
public string radius = string.Empty;
}
/// <summary>
+ /// 閫氱煡閰嶇疆
+ /// </summary>
+ [Serializable]
+ public class NoticeConfig
+ {
+ /// <summary>
+ /// 鏄惁寮�鍚�氱煡
+ /// </summary>
+ public bool enable = false;
+ /// <summary>
+ /// 閫氱煡鍐呭
+ /// </summary>
+ public string noticeContent = "鑷姩鍖栧凡缁忔墽琛�";//string.Empty;
+ }
+ /// <summary>
/// 鎺ㄩ�侀厤缃�
/// </summary>
[Serializable]
@@ -148,7 +174,7 @@
/// <summary>
/// 鎺ㄩ�佸唴瀹�
/// </summary>
- public string pushContent = string.Empty;
+ //public string pushContent = string.Empty;
/// <summary>
/// 鎺ㄩ�佺洰鏍�
/// </summary>
--
Gitblit v1.8.0