From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 28 +++++++++++++++++-----------
1 files changed, 17 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 0e4c022..5a95e83 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -240,7 +240,10 @@
var inputTypeJOb = new JObject { };
inputTypeJOb.Add("sid", dictionary.sid);
inputTypeJOb.Add("condition_type", dictionary.condition_type);
-
+ if (dictionary.condition_type == "9")
+ {
+ inputTypeJOb.Add("identifier", dictionary.identifier);
+ }
var conditionArray = new JArray { };
foreach (var dic in dictionary.condition)
{
@@ -378,7 +381,7 @@
/// <param name="logic">褰撳墠瀵硅薄</param>
/// <param name="isTip">鏄惁瑕佹彁绀�</param>
/// <returns></returns>
- public ResponsePackNew SwitchLogic(Logic logic,bool isTip=false)
+ public ResponsePackNew EnableLogic(Logic logic,bool isTip=false)
{
var jArray = new JArray { };
var job = new JObject { { "userLogicId", logic.userLogicId }, { "enable", logic.enable } };
@@ -389,14 +392,14 @@
if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
{
RefreshToken();
- SwitchLogic(logic, isTip);
+ EnableLogic(logic, isTip);
}
if (Check(responsePackNew, isTip) == false)
{
return null;
}
return responsePackNew;
- }
+ }
/// <summary>
/// 鑷姩鍖栧湴鐞嗗洿鏍忕姸鎬佷笂鎶�
/// </summary>
@@ -462,13 +465,16 @@
/// <summary>
///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛�
/// </summary>
+ /// <param name="o">鍙戦�佹暟鎹�</param>
+ /// <param name="api_Url">璇锋眰鍦板潃(涓嶆槸缁濆鍦板潃)</param>
+ /// <param name="tag">鏍囪->鎻忚堪鎺ュ彛(鑷畾涔�)</param>
/// <returns></returns>
- public ResponsePackNew RequestServerhomeId(object o, string api_Url, string tag,int mTimeout = 3)
+ public ResponsePackNew RequestServerhomeId(object o, string api_Url, string tag,int mTimeout = 3)
{
- Log($"{DateTime.Now}->鍙戦��->{tag}", o.ToString());
+ Log($"{DateTime.Now}->鍙戦��->{tag}", api_Url,o.ToString());
var requestJson = HttpUtil.GetSignRequestJson(o);
var r= HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout);
- Log($"{DateTime.Now}->鍥炲->{tag}", Newtonsoft.Json.JsonConvert.SerializeObject(r));
+ Log($"{DateTime.Now}->鍥炲->{tag}", "", Newtonsoft.Json.JsonConvert.SerializeObject(r));
return r;
}
@@ -481,10 +487,10 @@
/// <returns></returns>
public ResponsePackNew RequestServer(object o, string api_Url,string tag)
{
- Log($"鍙戦��->{tag}", o.ToString());
+ Log($"鍙戦�佹暟鎹�->{tag}", api_Url, o.ToString());
var requestJson = HttpUtil.GetSignRequestJson(o);
var r = HttpUtil.RequestHttpsPost(api_Url, requestJson);
- Log($"鍥炲->{tag}", Newtonsoft.Json.JsonConvert.SerializeObject(r));
+ Log($"鍥炲鏁版嵁->{tag}", "", Newtonsoft.Json.JsonConvert.SerializeObject(r));
return r;
}
/// <summary>
@@ -521,10 +527,10 @@
/// </summary>
/// <param name="tag">鎵撳嵃鏍囪</param>
/// <param name="content">鎵撳嵃鍐呭</param>
- public void Log(string tag, string content)
+ public void Log(string tag,string url, string content)
{
#if DEBUG
- Console.WriteLine(tag + $"\r\n鏁版嵁鍐呭->->{content}");
+ Console.WriteLine(tag + $"\r\n{url}\r\n{content}");
#endif
}
--
Gitblit v1.8.0