From 992cc7d4433f8f9e9b0a930ec095973e056abe1c Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 05 七月 2021 09:42:12 +0800
Subject: [PATCH] 20210705-1 代码备份
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index 838ba08..28e66fa 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -127,6 +127,11 @@
outputArray.Add(outputTypeJOb);
}
+
+ var noticeConfigJObject = new JObject();
+ noticeConfigJObject.Add("enable", logic.noticeConfig.enable);
+ noticeConfigJObject.Add("noticeContent", logic.noticeConfig.noticeContent);
+
var pushConfigsArray = new JArray { };
if (logic.pushConfigs.Count > 0)
{ //聽鎺ㄩ�佹枃鏈�
@@ -135,7 +140,6 @@
var pushConfigJob = new JObject { };
pushConfigJob.Add("pushMethod", pushConfig.pushMethod);
- pushConfigJob.Add("pushContent", pushConfig.pushContent);
var accountArray = new JArray { };
foreach (var account in pushConfig.pushTarget)
{
@@ -156,24 +160,22 @@
logicIfon.Add("cycle", cycleJObject);
logicIfon.Add("input", inputArray);
logicIfon.Add("output", outputArray);
+ logicIfon.Add("noticeConfig", noticeConfigJObject);
logicIfon.Add("pushConfigs", pushConfigsArray);
logicjArray.Add(logicIfon);
var jObject = new JObject { { "homeId", LogicMethod.HomeId }, { "logics", logicjArray } };
- responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Add);
+ responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Add,5);
//濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
{
RefreshToken();
AddLogic(logic);
}
-
}
catch (Exception e)
{
var dd = e.Message;
}
-
-
return responsePackNew;
}
/// <summary>
@@ -207,7 +209,10 @@
{
var conditionJOb = new JObject { };
conditionJOb.Add("key", dic["key"]);
- conditionJOb.Add("comparator", dic["comparator"]);
+ var c1 = "";
+ dic.TryGetValue("comparator", out c1);
+ c1 = string.IsNullOrEmpty(c1) ? "" : c1;
+ conditionJOb.TryAdd("comparator", c1);
conditionJOb.Add("data_type", dic["data_type"]);
conditionJOb.Add("value", dic["value"]);
conditionArray.Add(conditionJOb);
@@ -234,15 +239,19 @@
outputArray.Add(outputTypeJOb);
}
+ var noticeConfigJObject = new JObject();
+ noticeConfigJObject.Add("enable", logic.noticeConfig.enable);
+ noticeConfigJObject.Add("noticeContent", logic.noticeConfig.noticeContent);
+
var pushConfigsArray = new JArray { };
if (logic.pushConfigs.Count > 0)
- { //聽鎺ㄩ�佹枃鏈�
+ {
+ //聽鎺ㄩ�佹枃鏈�
foreach (var pushConfig in logic.pushConfigs)
{
var pushConfigJob = new JObject { };
pushConfigJob.Add("pushMethod", pushConfig.pushMethod);
- pushConfigJob.Add("pushContent", pushConfig.pushContent);
var accountArray = new JArray { };
foreach (var account in pushConfig.pushTarget)
{
@@ -264,11 +273,12 @@
logicIfon.Add("cycle", cycleJObject);
logicIfon.Add("input", inputArray);
logicIfon.Add("output", outputArray);
+ logicIfon.Add("noticeConfig", noticeConfigJObject);
logicIfon.Add("pushConfigs", pushConfigsArray);
logicjArray.Add(logicIfon);
var jObject = new JObject { { "homeId", LogicMethod.HomeId }, { "logics", logicjArray } };
- responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Update);
+ responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Update,5);
//濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
{
@@ -280,8 +290,6 @@
{
var dd = e.Message;
}
-
-
return responsePackNew;
}
/// <summary>
--
Gitblit v1.8.0