From 666b28d77fc3c1b1dae61c9dfd878c8e683cef8c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 21 四月 2023 13:37:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 147 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 103 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index ef2c271..8f4b4bc 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -2,7 +2,7 @@
using Shared;
using System.Collections.Generic;
using HDL_ON.Entity;
-
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
namespace HDL_ON.UI.UI2.Intelligence.Automation
{
@@ -623,7 +623,7 @@
case SPK.VideoDoorLock:
{
LogicView.FunTypeView view1 = new LogicView.FunTypeView();
- view1.btnText.TextID=StringId.yonghurenyuan;
+ view1.btnText.TextID=StringId.kaimenrenyuan;
view1.btnText.Name = Language.StringByID(StringId.shipinmensuo);
fLayout.AddChidren(view1.FLayoutView());
view1.btnClick.MouseUpEventHandler += (sender, e) =>
@@ -1060,37 +1060,52 @@
/// <param name="frame">褰撳墠鐣岄潰</param>
/// <param name="device">褰撳墠璁惧</param>
/// <param name="btnState">鏃х姸鎬�</param>
- public void FaceAction(FrameLayout frame, Entity.Function device,Button btnState) {
+ public void FaceAction(FrameLayout frame, Entity.Function device, Button btnState)
+ {
selectedState = device.spk + "_";
Loading loading = new Loading();
frame.AddChidren(loading);
loading.Start();
- System.Threading.Tasks.Task.Run(() =>
+
+ CommonMethod.Current.SunThread(() =>
{
try
{
- var faceIDList = Send.Current.GetListHomeFace(device.deviceId, true);
- List<string> faceNameList = new List<string>();
- for (int i = 0; i < faceIDList.Count; i++)
- {
- var face = faceIDList[i];
- faceNameList.Add(face.userName);
- }
- Application.RunOnMainThread(() =>
+ var faceIdList = Send.Current.GetListHomeFace(device.deviceId, true);
+
+ CommonMethod.Current.MainThread(() =>
{
loading.Hide();
+ string stateValue=btnState.Tag==null?"":btnState.Tag.ToString();
PublicInterface publicInterface = new PublicInterface();
- publicInterface.FrameOrVv(this, faceNameList, new List<string> { btnState.Text }, device.name, (index) =>
- {
- var face = faceIDList[index];
- //鐣岄潰鏄剧ず閫変腑鍊�
- btnState.Text = face.userName;
- //鏁版嵁灏佽
- AddDictionary("open_type", "1", "integer");
- AddDictionary("user_id", face.userId, "string");
+ publicInterface.MultiSelectShow(this, faceIdList, device.name, stateValue, (indexeList) =>
+ {
+ if (indexeList.Count > 0)
+ {
+ dicSateteList.Clear();
+ string s = string.Empty;
+ string tag = string.Empty;
+ //鏁版嵁灏佽
+ AddDictionary("open_type", "1", "integer");
+ for (int indexe = 0; indexe < indexeList.Count; indexe++)
+ {
+ if (indexe > faceIdList.Count)
+ {
+ continue;
+ }
+ var face = faceIdList[indexe];
+ AddDictionary("user_id", face.userId, "string");
+ s += face.userName;
+ s += ",";
+ tag += face.userId;
+ tag += "_";
+ }
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ btnState.Text = s;
+ btnState.Tag = tag;
+ }
- }, false);
-
+ });
});
}
catch { }
@@ -1118,30 +1133,45 @@
Loading loading = new Loading();
frame.AddChidren(loading);
loading.Start();
- System.Threading.Tasks.Task.Run(() =>
+ CommonMethod.Current.SunThread(() =>
{
try
{
- var userList =FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.GetVideoDoorLockUserListInfo(device);
- List<string> userNameList = new List<string>();
- for (int i = 0; i < userList.Count; i++)
+ var faceIdList = Send.Current.GetVideoDoorLockUserListInfo(device);
+ CommonMethod.Current.MainThread(() =>
{
- var user = userList[i];
- userNameList.Add(user.extUserName);
- }
- Application.RunOnMainThread(() =>
- {
- loading.Hide();
- PublicInterface publicInterface = new PublicInterface();//鐢ㄦ埛鐣岄潰
- publicInterface.FrameOrVv(this, userNameList, new List<string> { btnState.Text }, device.name, (index) =>
- {
- var userId = userNameList[index];
- //鐣岄潰鏄剧ず閫変腑鍊�
- btnState.Text = userId;
- //鏁版嵁灏佽
- AddDictionary("open_user", userId, "string");
- }, false);
+ loading.Hide();
+ string stateValue = btnState.Text == null ? "" : btnState.Text.ToString();
+ PublicInterface publicInterface = new PublicInterface();
+ publicInterface.MultiSelectShow(this, faceIdList, device.name, stateValue, (indexeList) =>
+ {
+ if (indexeList.Count > 0)
+ {
+ dicSateteList.Clear();
+ string s = string.Empty;
+ string tag = string.Empty;
+ for (int indexe = 0; indexe < indexeList.Count; indexe++)
+ {
+ if (indexe > faceIdList.Count)
+ {
+ continue;
+ }
+ var face = faceIdList[indexe];
+
+ //鏁版嵁灏佽<楂樿儨璇磋悿鐭抽偅杈规槸鎺ㄩ�佺敤鎴峰悕>
+ AddDictionary("open_user", face.userName, "string");
+ s += face.userName;
+ s += ",";
+ tag += face.userId;
+ tag += "_";
+ }
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ btnState.Text = s;
+ btnState.Tag = tag;
+ }
+
+ });
});
}
@@ -1267,16 +1297,45 @@
var dic = dictionaryB[i];
string key = dic["key"];
string comparatorValue = dic["comparator"];
+ string value = dic["value"];
if (dictionaryA["key"] == key && dictionaryA["comparator"] == comparatorValue)
{
- //鍒ゆ柇鏄惁瀛樺湪
- valueInt = i;
- break;
+ if (this.checkSpk())
+ {
+ //鏈変簺璁惧闇�瑕佸鍔犺繖涓垽鏂�
+ if (dictionaryA["value"] == value)
+ {
+ //鍒ゆ柇鏄惁瀛樺湪
+ valueInt = i;
+ break;
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鏄惁瀛樺湪
+ valueInt = i;
+ break;
+ }
}
}
return valueInt;
}
/// <summary>
+ /// 妫�鏌ユ槸鍚︽敮鎸�
+ /// </summary>
+ /// <returns></returns>
+ private bool checkSpk()
+ {
+ if (this.function.spk == SPK.VideoDoorLock ||
+ this.function.spk == SPK.doorgate
+ )
+ {
+ return true;
+ }
+ return false;
+
+ }
+ /// <summary>
/// 鍒ゆ柇dictionaryB鏄惁瀹屾暣鍖呭惈鍙︿竴涓猟ictionaryA
/// </summary>
/// <param name="dictionaryA"></param>
--
Gitblit v1.8.0