~wxr/HDL_APP_Project.git

			@@ -50,6 +50,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>();
			@@ -89,6 +93,8 @@
			/// 云端天气条件=6;
			/// 某个逻辑/场景的输出条件=7;
			/// 地理围栏=8;
			/// 空气质量=9;
			/// 场景=10;
			/// </summary>
			public string condition_type = "";
			public List<Dictionary<string, string>> condition = new List<Dictionary<string, string>>();
			@@ -108,10 +114,15 @@
			/// </summary>
			public string sid = "";
			/// <summary>
			/// 逻辑输出目标延时间(单位用秒)
			/// </summary>
			public string delay = "0";
			/// <summary>
			/// 逻辑输出目标类型
			/// 设备=1;
			/// 场景=2;
			/// 延时=3;
			/// 安防=3;
			/// 延时=4;
			/// </summary>
			public string target_type = "";
			public List<Dictionary<string, string>> status = new List<Dictionary<string, string>>();
			@@ -136,6 +147,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 +174,7 @@
			/// <summary>
			/// 推送内容
			/// </summary>
			public string pushContent = string.Empty;
			//public string pushContent = string.Empty;
			/// <summary>
			/// 推送目标
			/// </summary>