From b13a98b48df67d902da843a3bd3d5659e3737d17 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 28 四月 2021 14:48:55 +0800
Subject: [PATCH] 优化地暖界面、音乐入口界面
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 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..d643f14
--- 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,17 @@
/// 閫昏緫杈撳嚭鐩爣鏁扮粍
/// </summary>
public List<Output> output = new List<Output>();
-
+ /// <summary>
+ /// 鎺ㄩ�侀厤缃�
+ /// </summary>
+ public List<PushConfigs> pushConfigs = new List<PushConfigs>();
+
}
/// <summary>
/// 鎵ц鍛ㄦ湡瀵硅薄
/// </summary>
+ [Serializable]
public class Cycle
{
/// <summary>
@@ -66,6 +72,7 @@
/// <summary>
/// 杈撳叆鏉′欢瀵硅薄
/// </summary>
+ [Serializable]
public class Input
{
/// <summary>
@@ -85,10 +92,15 @@
/// </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>
@@ -104,7 +116,44 @@
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 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