From 6ee339fc947c01b08a6e549e232f320253f16120 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 14 九月 2023 18:04:03 +0800
Subject: [PATCH] 2023年09月14日18:04:01
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 78ef5ab..afa1a17 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -4,6 +4,7 @@
using HDL_ON.Entity;
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
+
namespace HDL_ON.UI.UI2.Intelligence.Automation
{
public class ConditionDeviceFunList : FrameLayout
@@ -59,6 +60,7 @@
public void Show(Entity.Function device, int index, bool edit)
{
+
this.function = device;
this.mEdit = edit;
this.mIndex = index;
@@ -818,7 +820,7 @@
////钀ょ煶瑙嗛闂ㄩ攣
inputDevice.condition_type = "9";
inputDevice.identifier = this.identifier;
- inputDevice.condition = new List<Dictionary<string, string>>();
+ //inputDevice.condition = new List<Dictionary<string, string>>();
}
else if (device.spk == SPK.SensorPirHold)
{
@@ -1304,8 +1306,10 @@
if (indexeList.Count > 0)
{
dicSateteList.Clear();
- string s = string.Empty;
+ string seleTxet = string.Empty;
string tag = string.Empty;
+ string[] array = new string[indexeList.Count];
+
for (int i = 0; i < indexeList.Count; i++)
{
if (i > faceIdList.Count)
@@ -1314,15 +1318,15 @@
}
var indexe = indexeList[i];
var face = faceIdList[indexe];
- //鏁版嵁灏佽<楂樿儨璇磋悿鐭抽偅杈规槸鎺ㄩ�佺敤鎴峰悕>
- AddDictionary("open_user", face.userName, "string");
- s += face.userName;
- s += ",";
tag += face.userId;
tag += "_";
+ array[i] = face.userName;
}
+ seleTxet = Newtonsoft.Json.JsonConvert.SerializeObject(array);
+ //鏁版嵁灏佽<楂樿儨璇磋悿鐭抽偅杈规槸鎺ㄩ�佺敤鎴峰悕>
+ AddDictionary("open_user",seleTxet, "string", "[]");
//鐣岄潰鏄剧ず閫変腑鍊�
- btnState.Text = s;
+ btnState.Text = InpOrOutLogicMethod.Current.RemoveLastStr(seleTxet);
btnState.Tag = tag;
}
--
Gitblit v1.8.0