From 42fad29b1e280b512452f5552d1e9ce98474252e Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期一, 17 五月 2021 09:40:14 +0800 Subject: [PATCH] 2021-05-17 1.在阿廖分支基础上增加iOS乐橙可视对讲功能,目前呼叫还有一点问题,偶尔会闪退,目前还没定位到原因 --- HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs | 53 ++--------------------------------------------------- 1 files changed, 2 insertions(+), 51 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..6d95d0e 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 { @@ -49,17 +48,12 @@ /// 閫昏緫杈撳嚭鐩爣鏁扮粍 /// </summary> public List<Output> output = new List<Output>(); - /// <summary> - /// 鎺ㄩ�侀厤缃� - /// </summary> - public List<PushConfigs> pushConfigs = new List<PushConfigs>(); - + } /// <summary> /// 鎵ц鍛ㄦ湡瀵硅薄 /// </summary> - [Serializable] public class Cycle { /// <summary> @@ -72,7 +66,6 @@ /// <summary> /// 杈撳叆鏉′欢瀵硅薄 /// </summary> - [Serializable] public class Input { /// <summary> @@ -92,15 +85,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> @@ -116,44 +104,7 @@ 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