From e1a8f2f7e4d850beedeb1469610b878c1427e976 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 09:01:53 +0800
Subject: [PATCH] 更新

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs |   34 ++++++++++++++++++++++++++++++----
 1 files changed, 30 insertions(+), 4 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..bbbea86 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>();
@@ -84,11 +88,13 @@
         /// 鏃堕棿鐐规潯浠�=1;
         /// 鏃堕棿娈垫潯浠�=2;
         /// 璁惧鐘舵�佸彉鍖栨潯浠�=3;
-        /// 鐜淇℃伅鏉′欢=4;
+        /// 鐜淇℃伅鏉′欢=4(搴熷純);
         /// 瀹夐槻鏉′欢=5;
         /// 浜戠澶╂皵鏉′欢=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>>();
@@ -131,9 +142,24 @@
         /// </summary>
         public string latitude = string.Empty;
         /// <summary>
-        /// 鍗曚綅绫�
+        /// 鍗婂緞<鍗曚綅绫�>
         /// </summary>
         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>
     /// 鎺ㄩ�侀厤缃�
@@ -148,7 +174,7 @@
         /// <summary>
         /// 鎺ㄩ�佸唴瀹�
         /// </summary>
-        public string pushContent = string.Empty;
+        //public string pushContent = string.Empty;
         /// <summary>
         /// 鎺ㄩ�佺洰鏍�
         /// </summary>

--
Gitblit v1.8.0