From cd70a2a8a2bdebf51259d8f39ed110a34b9be9e5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 四月 2023 14:50:21 +0800
Subject: [PATCH] 修改启动屏幕
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index 0c1a78e..fbf8818 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -197,6 +197,7 @@
logicIfon.Add("pushConfigs", pushConfigsArray);
logicjArray.Add(logicIfon);
var jObject = new JObject { { "homeId", LogicMethod.Current.HomeId }, { "logics", logicjArray } };
+ string str = jObject.ToString();
responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Add, "娣诲姞鑷姩鍖�", 5);
//濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
@@ -240,7 +241,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)
{
@@ -327,7 +331,6 @@
logicjArray.Add(logicIfon);
var jObject = new JObject { { "homeId", LogicMethod.Current.HomeId }, { "logics", logicjArray } };
-
string str = jObject.ToString();
responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Update, "缂栬緫鏇存柊鑷姩鍖�", 5);
//濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
@@ -459,16 +462,51 @@
}
+ /// <summary>
+ /// 鑾峰彇浣忓畢宸插綍鍏ヤ汉鑴镐俊鎭�
+ /// </summary>
+ /// <param name="deviceId">鍙瀵硅璁惧id</param>
+ /// <returns></returns>
+ public List<Face> GetHomeFaceList(string deviceId, bool isTip)
+ {
+ var jObject = new JObject();
+ jObject.Add("homeId", LogicMethod.Current.HomeId);
+ jObject.Add("deviceId", deviceId);
+ var responsePackNew = RequestServerhomeId(jObject, NewAPI.Api_Post_GetListHomeFace, "鑾峰彇浣忓畢宸插綍鍏ヤ汉鑴镐俊鎭�");
+ //濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
+ if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
+ {
+ RefreshToken();
+ GetListHomeFace(deviceId, isTip);
+ }
+ if (Check(responsePackNew, isTip) == false)
+ {
+ return new List<Face>();
+ }
+ var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Face>>(responsePackNew.Data.ToString());
+ if (list == null)
+ {
+ list = new List<Face>();
+ }
+ faceList.Clear();
+ faceList.AddRange(list);
+ return list;
+
+ }
+
/// <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 +519,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 +559,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