From f46be160caed45c67e8980173d29ed48d525a4d3 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 14:49:52 +0800
Subject: [PATCH] 2023年03月28日14:49:50
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 3e8e461..4a885bc 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -1061,7 +1061,7 @@
{
try
{
- var faceIDList = Send.Current.GetListHomeFace(device.deviceId,true);
+ var faceIDList = Send.Current.GetListHomeFace(device.deviceId, true);
List<string> faceNameList = new List<string>();
for (int i = 0; i < faceIDList.Count; i++)
{
@@ -1086,13 +1086,20 @@
});
}
catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ loading.Hide();
+ });
+ }
});
}
/// <summary>
- /// 钀ょ煶瑙嗛闂ㄩ攣涓撶敤(浜岀骇鐣岄潰)
+ /// 钀ょ煶瑙嗛闂ㄩ攣涓撶敤
/// </summary>
/// <param name="frame">褰撳墠鐣岄潰</param>
/// <param name="device">褰撳墠璁惧</param>
@@ -1107,31 +1114,37 @@
{
try
{
- var userList = Send.Current.GetVideoDoorLockUserIdList(device.deviceId, true);
- List<string> userIdList = new List<string>();
+ var userList =FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.GetVideoDoorLockUserListInfo(device);
+ List<string> userNameList = new List<string>();
for (int i = 0; i < userList.Count; i++)
{
var user = userList[i];
- userIdList.Add(user.userName);
+ userNameList.Add(user.extUserName);
}
Application.RunOnMainThread(() =>
{
loading.Hide();
- PublicInterface publicInterface = new PublicInterface();
- publicInterface.FrameOrVv(this, userIdList, new List<string> { btnState.Text }, device.name, (index) =>
+ PublicInterface publicInterface = new PublicInterface();//鐢ㄦ埛鐣岄潰
+ publicInterface.FrameOrVv(this, userNameList, new List<string> { btnState.Text }, device.name, (index) =>
{
- var userId = userIdList[index];
+ var userId = userNameList[index];
//鐣岄潰鏄剧ず閫変腑鍊�
btnState.Text = userId;
//鏁版嵁灏佽
- AddDictionary("open_type", "1", "integer");
- AddDictionary("user_id", userId, "string");
+ AddDictionary("open_user", userId, "string");
}, false);
});
}
catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ loading.Hide();
+ });
+ }
});
--
Gitblit v1.8.0