From bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 五月 2023 09:11:18 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr' into Dev-Branch
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 23 +++++++++++++----------
1 files changed, 13 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 ea5a613..0cf91cc 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -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) =>
@@ -1072,11 +1072,11 @@
try
{
var faceIdList = Send.Current.GetListHomeFace(device.deviceId, true);
-
+
CommonMethod.Current.MainThread(() =>
{
loading.Hide();
- string stateValue=btnState.Tag==null?"":btnState.Tag.ToString();
+ string stateValue = btnState.Tag == null ? "" : btnState.Tag.ToString();
PublicInterface publicInterface = new PublicInterface();
publicInterface.MultiSelectShow(this, faceIdList, device.name, stateValue, (indexeList) =>
{
@@ -1087,12 +1087,14 @@
string tag = string.Empty;
//鏁版嵁灏佽
AddDictionary("open_type", "1", "integer");
- for (int indexe = 0; indexe < indexeList.Count; indexe++)
+ for (int i = 0; i < indexeList.Count; i++)
{
- if (indexe > faceIdList.Count)
+
+ if (i > faceIdList.Count)
{
continue;
}
+ var indexe = indexeList[i];
var face = faceIdList[indexe];
AddDictionary("user_id", face.userId, "string");
s += face.userName;
@@ -1142,7 +1144,7 @@
{
loading.Hide();
- string stateValue = btnState.Tag == null ? "" : btnState.Tag.ToString();
+ string stateValue = btnState.Text == null ? "" : btnState.Text.ToString();
PublicInterface publicInterface = new PublicInterface();
publicInterface.MultiSelectShow(this, faceIdList, device.name, stateValue, (indexeList) =>
{
@@ -1151,15 +1153,16 @@
dicSateteList.Clear();
string s = string.Empty;
string tag = string.Empty;
- for (int indexe = 0; indexe < indexeList.Count; indexe++)
+ for (int i = 0; i < indexeList.Count; i++)
{
- if (indexe > faceIdList.Count)
+ if (i > faceIdList.Count)
{
continue;
}
+ var indexe = indexeList[i];
var face = faceIdList[indexe];
- //鏁版嵁灏佽
- AddDictionary("open_user", face.userId, "string");
+ //鏁版嵁灏佽<楂樿儨璇磋悿鐭抽偅杈规槸鎺ㄩ�佺敤鎴峰悕>
+ AddDictionary("open_user", face.userName, "string");
s += face.userName;
s += ",";
tag += face.userId;
--
Gitblit v1.8.0