From adc150efb13a0506f45a3c344c3ee2ef2dba8e90 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:19:13 +0800
Subject: [PATCH] 合并嘉乐lc代码

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs |   89 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 85 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 2cd57e7..f4ae025 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
@@ -7,10 +7,19 @@
     /// </summary>
     public class Logic
     {
+
+        /// <summary>
+        /// 閫昏緫鍒楄〃
+        /// </summary>
+        public static List<Logic> LogicList = new List<Logic>();
         /// <summary>
         /// 褰撳墠閫昏緫
         /// </summary>
         public static Logic currlogic;
+        /// <summary>
+        /// 浜戠鍞竴id
+        /// </summary>
+        public string userLogicId = "";
         /// <summary>
         /// 閫昏緫鍞竴鏍囪瘑
         /// </summary>
@@ -18,11 +27,11 @@
         /// <summary>
         /// 閫昏緫鍚嶇О
         /// </summary>
-        public string name = "閫昏緫涓�";
+        public string name = "鑷姩鍖�";
         /// <summary>
         /// 閫昏緫鏉′欢鍏崇郴锛堜笌and:锛屾垨:or锛�
         /// </summary>
-        public string relation = "or";
+        public string relation = "and";
         /// <summary>
         /// 閫昏緫鐘舵�侊紙true锛宖alse锛�
         /// </summary>
@@ -39,7 +48,19 @@
         /// 閫昏緫杈撳嚭鐩爣鏁扮粍
         /// </summary>
         public List<Output> output = new List<Output>();
+<<<<<<< HEAD
+        /// <summary>
+        /// 閫氱煡閰嶇疆
+        /// </summary>
+        public NoticeConfig noticeConfig = new NoticeConfig();
+        /// <summary>
+        /// 鎺ㄩ�侀厤缃�
+        /// </summary>
+        public List<PushConfigs> pushConfigs = new List<PushConfigs>();
+
+=======
        
+>>>>>>> origin/CJL-LC
 
     }
     /// <summary>
@@ -51,7 +72,7 @@
         /// 鏃堕棿绫诲瀷
         /// (鎵ц涓�娆�:once锛屾瘡澶�:day锛屾瘡鏈�:mon锛屾槦鏈�:week锛屾棩鏈熸:date_to_date)
         /// </summary>
-        public string type = "";
+        public string type = "day";
         public List<string> value = new List<string>();
     }
     /// <summary>
@@ -87,15 +108,75 @@
         /// </summary>
         public string sid = "";
         /// <summary>
+        /// 閫昏緫杈撳嚭鐩爣寤舵椂闂�(鍗曚綅鐢ㄧ)
+        /// </summary>
+        public string delay = "0";
+        /// <summary>
         /// 閫昏緫杈撳嚭鐩爣绫诲瀷
         /// 璁惧=1;
         /// 鍦烘櫙=2;
-        /// 瀹夐槻=3;
+        /// 寤舵椂=3;
         /// </summary>
         public string target_type = "";
         public List<Dictionary<string, string>> status = new List<Dictionary<string, string>>();
     }
+<<<<<<< HEAD
+    /// <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> {};
+    }
+=======
 
+>>>>>>> origin/CJL-LC
 
 }
 

--
Gitblit v1.8.0