From 1830691fd179285d2df7f035e4f7f5a260e819c7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 19 九月 2023 09:32:47 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index e088e95..b2fcb2e 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -5,6 +5,7 @@
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Newtonsoft.Json;
+
namespace HDL_ON.UI.UI2.Intelligence.Automation
{
public class ConditionDeviceFunList : FrameLayout
@@ -60,6 +61,7 @@
public void Show(Entity.Function device, int index, bool edit)
{
+
this.function = device;
this.mEdit = edit;
this.mIndex = index;
@@ -1321,9 +1323,7 @@
tag += "_";
array[i] = face.userName;
}
- string jsonString = JsonConvert.SerializeObject(array).ToString();
-
-
+ seleTxet = Newtonsoft.Json.JsonConvert.SerializeObject(array);
//鏁版嵁灏佽<楂樿儨璇磋悿鐭抽偅杈规槸鎺ㄩ�佺敤鎴峰悕>
AddDictionary("open_user",seleTxet, "string", "[]");
//鐣岄潰鏄剧ず閫変腑鍊�
--
Gitblit v1.8.0