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 |   83 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 79 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
old mode 100755
new mode 100644
index 9bbb5a8..19c31ea
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
@@ -5,6 +5,7 @@
     /// <summary>
     /// 閫昏緫瀛樺偍鏁版嵁瀵硅薄
     /// </summary>
+    [Serializable]
     public class Logic
     {
 
@@ -31,7 +32,7 @@
         /// <summary>
         /// 閫昏緫鏉′欢鍏崇郴锛堜笌and:锛屾垨:or锛�
         /// </summary>
-        public string relation = "or";
+        public string relation = "and";
         /// <summary>
         /// 閫昏緫鐘舵�侊紙true锛宖alse锛�
         /// </summary>
@@ -48,12 +49,21 @@
         /// 閫昏緫杈撳嚭鐩爣鏁扮粍
         /// </summary>
         public List<Output> output = new List<Output>();
-       
+        /// <summary>
+        /// 閫氱煡閰嶇疆
+        /// </summary>
+        public NoticeConfig noticeConfig = new NoticeConfig();
+        /// <summary>
+        /// 鎺ㄩ�侀厤缃�
+        /// </summary>
+        public List<PushConfigs> pushConfigs = new List<PushConfigs>();
+
 
     }
     /// <summary>
     /// 鎵ц鍛ㄦ湡瀵硅薄
     /// </summary>
+    [Serializable]
     public class Cycle
     {
         /// <summary>
@@ -66,6 +76,7 @@
     /// <summary>
     /// 杈撳叆鏉′欢瀵硅薄
     /// </summary>
+    [Serializable]
     public class Input
     {
         /// <summary>
@@ -82,13 +93,20 @@
         /// 浜戠澶╂皵鏉′欢=6;
         /// 鏌愪釜閫昏緫/鍦烘櫙鐨勮緭鍑烘潯浠�=7;
         /// 鍦扮悊鍥存爮=8;
+        /// 绌烘皵璐ㄩ噺=9;
+        /// 鍦烘櫙=10;
         /// </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>
@@ -96,15 +114,72 @@
         /// </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>>();
     }
-
+    /// <summary>
+    /// 鍦扮悊鍥存爮閰嶇疆
+    /// </summary>
+    [Serializable]
+    public class Fence
+    {
+        /// <summary>
+        /// 缁忓害
+        /// </summary>
+        public string longitude = string.Empty;
+        /// <summary>
+        /// 绾害
+        /// </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>
+    /// 鎺ㄩ�侀厤缃�
+    /// </summary>
+    [Serializable]
+    public class PushConfigs
+    {
+        /// <summary>
+        /// 鎺ㄩ�佹柟寮�(APP/SMS)
+        /// </summary>
+        public string pushMethod = "APP";
+        /// <summary>
+        /// 鎺ㄩ�佸唴瀹�
+        /// </summary>
+        //public string pushContent = string.Empty;
+        /// <summary>
+        /// 鎺ㄩ�佺洰鏍�
+        /// </summary>
+        public List<string> pushTarget = new List<string> {};
+    }
 
 }
 

--
Gitblit v1.8.0