From 4e7c1dd0767d551ec3194ead9f3de0a219a802c3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 25 九月 2023 17:24:37 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr-2.1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 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..345ebdd 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -3,6 +3,8 @@
using System.Collections.Generic;
using HDL_ON.Entity;
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
+using Newtonsoft.Json;
+
namespace HDL_ON.UI.UI2.Intelligence.Automation
{
@@ -59,6 +61,7 @@
public void Show(Entity.Function device, int index, bool edit)
{
+
this.function = device;
this.mEdit = edit;
this.mIndex = index;
@@ -255,6 +258,22 @@
view.btnClick.MouseUpEventHandler += (sender, e) =>
{
DeviceView(device, view.btnState, StringId.kaiqi, StringId.bihe);
+ };
+ if (edit)
+ {
+ GetEditState(device, index, view.btnState, null, null, null);
+ }
+ }
+ break;
+ //绱ф�ュ懠鍙紶鎰熷櫒
+ case SPK.SensorHelp:
+ {
+ LogicView.FunTypeView view = new LogicView.FunTypeView();
+ view.btnText.TextID = StringId.qiujiuandzhengchang;
+ fLayout.AddChidren(view.FLayoutView());
+ view.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ DeviceView(device, view.btnState, StringId.qiujiu, StringId.zhengchang );
};
if (edit)
{
@@ -818,7 +837,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)
{
@@ -893,6 +912,7 @@
case SPK.SensorGas:
case SPK.SensorWater:
case SPK.SensorSmoke:
+ case SPK.SensorHelp:
{
keyVlaue = "status";
if (!Is_SpkAttribute(keyVlaue)) {
@@ -963,12 +983,14 @@
{
case StringId.xieluo:
case StringId.luoshui:
+ case StringId.qiujiu:
{
value = "alarm";
}
break;
case StringId.wuxieluo:
case StringId.wuluoshui:
+ case StringId.zhengchang:
{
value = "normal";
}
@@ -1304,8 +1326,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 +1338,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