From 5f1fdf638033a87980b84689fb6f29f70cf68c6e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 11:15:35 +0800
Subject: [PATCH] Merge branch 'wxr6' into MergeFL

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 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..92d5437 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
@@ -5,7 +5,6 @@
     /// <summary>
     /// 閫昏緫瀛樺偍鏁版嵁瀵硅薄
     /// </summary>
-    [Serializable]
     public class Logic
     {
 
@@ -50,6 +49,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>();
@@ -59,7 +62,6 @@
     /// <summary>
     /// 鎵ц鍛ㄦ湡瀵硅薄
     /// </summary>
-    [Serializable]
     public class Cycle
     {
         /// <summary>
@@ -72,7 +74,6 @@
     /// <summary>
     /// 杈撳叆鏉′欢瀵硅薄
     /// </summary>
-    [Serializable]
     public class Input
     {
         /// <summary>
@@ -92,21 +93,20 @@
         /// </summary>
         public string condition_type = "";
         public List<Dictionary<string, string>> condition = new List<Dictionary<string, string>>();
-        /// <summary>
-        /// 鍦扮悊鍥存爮閰嶇疆
-        /// </summary>
-        public Fence geo_fence = new Fence();
     }
     /// <summary>
     /// 杈撳嚭鐩爣瀵硅薄
     /// </summary>
-    [Serializable]
     public class Output
     {
         /// <summary>
         /// 閫昏緫杈撳嚭鐩爣鍞竴鏍囪瘑
         /// </summary>
         public string sid = "";
+        /// <summary>
+        /// 閫昏緫杈撳嚭鐩爣寤舵椂闂�(鍗曚綅鐢ㄧ)
+        /// </summary>
+        public string delay = "0";
         /// <summary>
         /// 閫昏緫杈撳嚭鐩爣绫诲瀷
         /// 璁惧=1;
@@ -136,6 +136,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 +163,7 @@
         /// <summary>
         /// 鎺ㄩ�佸唴瀹�
         /// </summary>
-        public string pushContent = string.Empty;
+        //public string pushContent = string.Empty;
         /// <summary>
         /// 鎺ㄩ�佺洰鏍�
         /// </summary>

--
Gitblit v1.8.0