From 1ee407dd57a7273ef6b686ac25a40d4199f5bce9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 10:14:41 +0800
Subject: [PATCH] Merge branch 'wxr6' into wxr4
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
index d392722..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
{
@@ -63,7 +62,6 @@
/// <summary>
/// 鎵ц鍛ㄦ湡瀵硅薄
/// </summary>
- [Serializable]
public class Cycle
{
/// <summary>
@@ -76,7 +74,6 @@
/// <summary>
/// 杈撳叆鏉′欢瀵硅薄
/// </summary>
- [Serializable]
public class Input
{
/// <summary>
@@ -96,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>
@@ -112,6 +104,10 @@
/// </summary>
public string sid = "";
/// <summary>
+ /// 閫昏緫杈撳嚭鐩爣寤舵椂闂�(鍗曚綅鐢ㄧ)
+ /// </summary>
+ public string delay = "0";
+ /// <summary>
/// 閫昏緫杈撳嚭鐩爣绫诲瀷
/// 璁惧=1;
/// 鍦烘櫙=2;
--
Gitblit v1.8.0