From b07d4f6ffbbc942c2e00fbedee5203bbec8d52fb Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 30 五月 2023 09:41:34 +0800
Subject: [PATCH] IOS门锁开锁二次确认弹窗，LC Sdk更新
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 18e1a35..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;
@@ -1151,14 +1153,14 @@
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.userName, "string");
s += face.userName;
--
Gitblit v1.8.0