From 5b79523a11f79631b04d062e0c0009f98b75bde7 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 12 七月 2024 15:23:41 +0800
Subject: [PATCH] Update HDL_APP_Project.sln
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 105 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index bb125ff..62b146d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -23,6 +23,7 @@
}
}
public List<Face> faceList = new List<Face>();
+ public List<Face> VideoDoorLockUserListInfo = new List<Face>();
/// <summary>
/// 璋冪敤鑾峰彇浣忓畢瀛愯处鍙峰垪琛�
/// </summary>
@@ -46,7 +47,7 @@
/// 鑾峰彇閫昏緫ID鍒楄〃
/// </summary>
/// <returns></returns>
- public ResponsePackNew GetLogicIdList(bool isTip = false)
+ public List<LogicIdData> GetLogicIdList(bool isTip = false)
{
var jObject = new JObject { { "homeId", LogicMethod.Current.HomeId } };
var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_List, "鑾峰彇閫昏緫ID鍒楄〃");
@@ -60,14 +61,22 @@
{
return null;
}
- return responsePackNew;
+ List<LogicIdData> dateList = new List<LogicIdData>();
+ try
+ {
+ dateList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<LogicIdData>>(responsePackNew.Data.ToString());
+ }catch (Exception ex)
+ {
+ MainPage.Log($"鑾峰彇閫昏緫ID鍒楄〃寮傚父锛歿ex.Message}");
+ }
+ return dateList;
}
/// <summary>
/// 鑾峰彇鑷姩鍖栬鎯�
/// </summary>
/// <param name="listIdList">鑷姩鍖朓D鍒楄〃</param>
/// <returns></returns>
- public ResponsePackNew GetLogic(List<string> listIdList, bool isTip = false)
+ public ResponsePackNew GetLogic1(List<string> listIdList, bool isTip = false)
{
var jArray = new JArray { };
for (int i = 0; i < listIdList.Count; i++)
@@ -88,6 +97,35 @@
}
return responsePackNew;
}
+
+ /// <summary>
+ /// 鑾峰彇鑷姩鍖栬鎯�
+ /// </summary>
+ /// <param name="listIdList">鑷姩鍖朓D鍒楄〃</param>
+ /// <returns></returns>
+ public List<Logic> GetLogic(List<string> listIdList, bool isTip = false)
+ {
+ var jArray = new JArray { };
+ for (int i = 0; i < listIdList.Count; i++)
+ {
+ jArray.Add(listIdList[i]);
+ }
+ var jObject = new JObject { { "userLogicIds", jArray } };
+ var responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Info, "鑾峰彇鑷姩鍖栬鎯�");
+ //濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
+ if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
+ {
+ RefreshToken();
+ GetLogic(listIdList, isTip);
+ }
+ if (Check(responsePackNew, isTip) == false)
+ {
+ return null;
+ }
+ var logicList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Logic>>(responsePackNew.Data.ToString());
+ return logicList;
+ }
+
/// <summary>
/// 娣诲姞鑷姩鍖栧懡浠�
/// </summary>
@@ -113,6 +151,14 @@
{
var inputTypeJOb = new JObject { };
inputTypeJOb.Add("sid", dictionary.sid);
+ if (!string.IsNullOrEmpty(dictionary.hold_time))
+ {
+ inputTypeJOb.Add("hold_time", dictionary.hold_time);
+ }
+ if (!string.IsNullOrEmpty(dictionary.detect_type))
+ {
+ inputTypeJOb.Add("detect_type", dictionary.detect_type);
+ }
inputTypeJOb.Add("condition_type", dictionary.condition_type);
if (dictionary.condition_type=="9") {
inputTypeJOb.Add("identifier", dictionary.identifier);
@@ -197,6 +243,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)
@@ -239,8 +286,19 @@
{
var inputTypeJOb = new JObject { };
inputTypeJOb.Add("sid", dictionary.sid);
+ if (!string.IsNullOrEmpty(dictionary.hold_time))
+ {
+ inputTypeJOb.Add("hold_time", dictionary.hold_time);
+ }
+ if (!string.IsNullOrEmpty(dictionary.detect_type))
+ {
+ inputTypeJOb.Add("detect_type", dictionary.detect_type);
+ }
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 +385,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,6 +516,39 @@
}
+ /// <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>
@@ -466,7 +556,7 @@
/// <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 = 8)
{
Log($"{DateTime.Now}->鍙戦��->{tag}", api_Url,o.ToString());
var requestJson = HttpUtil.GetSignRequestJson(o);
@@ -505,20 +595,23 @@
/// <returns></returns>
public bool Check(ResponsePackNew r, bool isTip)
{
+ if (r == null)
+ {
+ r = new ResponsePackNew { message = "娌″洖澶�,璇风‘璁ょ綉缁滄槸鍚︽甯�.", Code = "-1", };
+ }
if (r.Code == "0" && r.Data != null && r.Data.ToString() != "")
{
return true;
}
- if (r.Code != "0")
+ //澶辫触鏃舵槸鍚﹁鎻愮ず
+ if (isTip)
{
- //澶辫触鏃舵槸鍚﹁鎻愮ず
- if (isTip)
- {
- new LogicView.TipPopView().FlashingBox(r.message + $"({r.Code})");
- }
+ new LogicView.TipPopView().FlashingBox(r.message + $"({r.Code})");
}
return false;
}
+
+
/// <summary>
/// 鎵撳嵃鏃ュ織
/// </summary>
--
Gitblit v1.8.0