From a6e32221aa4bc5019a066fad90c4955064647cae Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 10 七月 2023 14:16:00 +0800
Subject: [PATCH] 视频门锁功能记录
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 430bd42..4b268ed 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -467,6 +467,12 @@
}
break;
+ case SPK.Ev_Ipcam:
+ if (inputCondition.identifier == "pir_event")
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.On);
+ }
+ break;
case SPK.SensorPirHold:
{
string value = this.GetKeyValue("people_status", dicList);
@@ -1002,7 +1008,10 @@
//鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
switch (device.spk)
{
-
+ case SPK.CommonSeries:
+ targetView.btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/groupControl.png";
+ stateStr = GetKeyValue("on_off", dicList) == "on" ? Language.StringByID(StringId.onLogic) : Language.StringByID(StringId.offLogic);
+ break;
//鎻掑骇(鏈塙SB)
case SPK.PanelSocket:
{
@@ -1045,6 +1054,24 @@
case SPK.LightCCT:
case SPK.LightDimming:
{
+ if(device.spk == SPK.LightRGB)
+ {
+ string colorful = GetKeyValue(FunctionAttributeKey.Colorful, dicList);
+ if (!string.IsNullOrEmpty(colorful))
+ {
+ targetView.btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/groupControl.png";
+ if (colorful == "on")
+ {
+ stateStr = Language.StringByID(StringId.onLogic);
+ }
+ else if (colorful == "off")
+ {
+ stateStr = Language.StringByID(StringId.offLogic);
+ }
+
+ break;
+ }
+ }
string on_off = GetKeyValue("on_off", dicList);
string brightness = GetKeyValue("brightness", dicList);
if (on_off == "on" && brightness != "")
--
Gitblit v1.8.0