From 753e67c3705dddb8e913bd853db151f94f81d600 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期一, 05 六月 2023 09:45:05 +0800 Subject: [PATCH] Merge branch 'Dev-Wxr' --- HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs index d6835e6..8ea607a 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> @@ -462,6 +463,62 @@ } + /// <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> + /// 鑾峰彇闂ㄩ攣鐢ㄦ埛鍒楄〃(钀ょ煶瑙嗛闂ㄩ攣) + /// </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锛� /// </summary> -- Gitblit v1.8.0