From b08e205f2ca465a80988fb72286481b8ba5b92ef Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 01 七月 2021 14:18:59 +0800
Subject: [PATCH] 代码合并整理
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs | 29 ++++++++++++++++++++---------
1 files changed, 20 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..e63e151 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,15 +93,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>
@@ -136,6 +132,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 +159,7 @@
/// <summary>
/// 鎺ㄩ�佸唴瀹�
/// </summary>
- public string pushContent = string.Empty;
+ //public string pushContent = string.Empty;
/// <summary>
/// 鎺ㄩ�佺洰鏍�
/// </summary>
--
Gitblit v1.8.0