From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 30 ++++--------------------------
1 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index c8c2e0e..dbe83ef 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -54,8 +54,9 @@
//濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
{
- RefreshToken();
- GetLogicIdList(isTip);
+ //RefreshToken();
+ //GetLogicIdList(isTip);
+ return null;
}
if (Check(responsePackNew, isTip) == false)
{
@@ -548,29 +549,6 @@
}
- /// <summary>
- /// 鑾峰彇闂ㄩ攣鐢ㄦ埛鍒楄〃(钀ょ煶瑙嗛闂ㄩ攣)
- /// </summary>
- /// <param name="deviceId">璁惧</param>
- /// <returns></returns>
- public List<Face> GetVideoDoorLockUserListInfo(Function device)
- {
- var userList = FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.GetVideoDoorLockUserListInfo(device);
- List<Face> faceIdList = new List<Face>();
- for (int i = 0; i < userList.Count; i++)
- {
- Face face = new Face();
- var user = userList[i];
- face.userId = user.extUserId;
- face.userName = user.extUserName;
- faceIdList.Add(face);
- }
- VideoDoorLockUserListInfo.Clear();
- VideoDoorLockUserListInfo.AddRange(faceIdList);
- return faceIdList;
- }
-
-
/// <summary>
///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛�
@@ -579,7 +557,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);
--
Gitblit v1.8.0