From a0b77501012265c4638c9f49ccfd1e6cd0f71a45 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 09 三月 2023 18:44:00 +0800
Subject: [PATCH] 2023年03月09日18:43:53
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 89 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 84 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 064ddef..3e8e461 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -466,6 +466,21 @@
};
}
break;
+ //pm10
+ case SPK.SensorPm10:
+ {
+ ///pm210
+ LogicView.FunTypeView pm10View = new LogicView.FunTypeView();
+ pm10View.btnText.TextID = StringId.pm10;
+ fLayout.AddChidren(pm10View.FLayoutView());
+
+ ///pm10鐐瑰嚮浜嬩欢
+ pm10View.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ PmCo2TvocAction(this, device, "pm10", StringId.pm10, index, edit);
+ };
+ }
+ break;
//pm2.5
case SPK.SensorPm25:
{
@@ -603,7 +618,24 @@
}
}
break;
-
+ //钀ょ煶瑙嗛闂ㄩ攣
+ case SPK.VideoDoorLock:
+ {
+ LogicView.FunTypeView view1 = new LogicView.FunTypeView();
+ view1.btnText.Text = "鐢ㄦ埛浜哄憳";// StringId.shipintonghuahujiao;
+ view1.btnText.Name = Language.StringByID(StringId.shipinmensuo);
+ fLayout.AddChidren(view1.FLayoutView());
+ view1.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ this.VideoDoorLockAction(this, device, view1.btnState);
+ };
+ if (edit)
+ {
+ this.GetEditState(device, index, view1.btnState,null, null, null);
+ }
+ }
+ break;
+
}
#region 淇濆瓨
///淇濆瓨View
@@ -632,7 +664,7 @@
Input inputDevice = new Input();
inputDevice.condition_type = "3";
inputDevice.sid = device.sid;
- inputDevice.condition = dicSateteList;
+ inputDevice.condition.AddRange(dicSateteList);
if (device.spk == SPK.doorgate)
{
//鍙瀵硅
@@ -913,7 +945,7 @@
if (inputs.condition.Count != 0)
{
//鏈夋暟鎹噸鏂拌祴鍊�
- dicSateteList = inputs.condition;
+ dicSateteList.AddRange(inputs.condition);
}
}
new LogicView.TipPopView { }.InputBox(textInt, stateValue, (value) =>
@@ -975,7 +1007,7 @@
if (inputs.condition.Count != 0)
{
//鏈夋暟鎹噸鏂拌祴鍊�
- dicSateteList = inputs.condition;
+ dicSateteList.AddRange(inputs.condition);
}
}
PublicInterface view = new PublicInterface();
@@ -1001,6 +1033,7 @@
case SPK.SensorPm25:
case SPK.SensorTVOC:
case SPK.SensorHcho:
+ case SPK.SensorPm10:
{
if (!Is_SpkAttribute(key))
{
@@ -1059,6 +1092,52 @@
}
/// <summary>
+ /// 钀ょ煶瑙嗛闂ㄩ攣涓撶敤(浜岀骇鐣岄潰)
+ /// </summary>
+ /// <param name="frame">褰撳墠鐣岄潰</param>
+ /// <param name="device">褰撳墠璁惧</param>
+ /// <param name="btnState">鏃х姸鎬�</param>
+ public void VideoDoorLockAction(FrameLayout frame, Entity.Function device, Button btnState)
+ {
+ selectedState = device.spk + "_";
+ Loading loading = new Loading();
+ frame.AddChidren(loading);
+ loading.Start();
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ try
+ {
+ var userList = Send.Current.GetVideoDoorLockUserIdList(device.deviceId, true);
+ List<string> userIdList = new List<string>();
+ for (int i = 0; i < userList.Count; i++)
+ {
+ var user = userList[i];
+ userIdList.Add(user.userName);
+ }
+ Application.RunOnMainThread(() =>
+ {
+ loading.Hide();
+ PublicInterface publicInterface = new PublicInterface();
+ publicInterface.FrameOrVv(this, userIdList, new List<string> { btnState.Text }, device.name, (index) =>
+ {
+ var userId = userIdList[index];
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ btnState.Text = userId;
+ //鏁版嵁灏佽
+ AddDictionary("open_type", "1", "integer");
+ AddDictionary("user_id", userId, "string");
+
+ }, false);
+
+ });
+ }
+ catch { }
+
+ });
+
+ }
+
+ /// <summary>
/// 鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
/// </summary>
/// <param name="device">缂栬緫璁惧</param>
@@ -1076,7 +1155,7 @@
if (dicList.Count != 0)
{
//鏈夋暟鎹噸鏂拌祴鍊�
- dicSateteList = dicList;
+ dicSateteList.AddRange(dicList);
}
InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4);
}
--
Gitblit v1.8.0