From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs | 77 ++++++++++++++++++++++++++++++++++++--
1 files changed, 73 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 95f9f48..92d5437 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
@@ -7,6 +7,7 @@
/// </summary>
public class Logic
{
+
/// <summary>
/// 閫昏緫鍒楄〃
/// </summary>
@@ -16,17 +17,21 @@
/// </summary>
public static Logic currlogic;
/// <summary>
+ /// 浜戠鍞竴id
+ /// </summary>
+ public string userLogicId = "";
+ /// <summary>
/// 閫昏緫鍞竴鏍囪瘑
/// </summary>
public string sid = "";
/// <summary>
/// 閫昏緫鍚嶇О
/// </summary>
- public string name = "閫昏緫涓�";
+ public string name = "鑷姩鍖�";
/// <summary>
/// 閫昏緫鏉′欢鍏崇郴锛堜笌and:锛屾垨:or锛�
/// </summary>
- public string relation = "or";
+ public string relation = "and";
/// <summary>
/// 閫昏緫鐘舵�侊紙true锛宖alse锛�
/// </summary>
@@ -43,7 +48,15 @@
/// 閫昏緫杈撳嚭鐩爣鏁扮粍
/// </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>
@@ -91,6 +104,10 @@
/// </summary>
public string sid = "";
/// <summary>
+ /// 閫昏緫杈撳嚭鐩爣寤舵椂闂�(鍗曚綅鐢ㄧ)
+ /// </summary>
+ public string delay = "0";
+ /// <summary>
/// 閫昏緫杈撳嚭鐩爣绫诲瀷
/// 璁惧=1;
/// 鍦烘櫙=2;
@@ -99,7 +116,59 @@
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