From 4296d04029fb5dc41f0ab781c5cf6c60b2cc9670 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 04 八月 2023 11:37:20 +0800
Subject: [PATCH] 三相空开控件优化
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 5f184b0..1d787cb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -460,7 +460,7 @@
break;
case SPK.IpCam_Imou:
{
- if (inputCondition.identifier == "door_caipcam_region_alram_eventll_cloud_event")
+ if (inputCondition.identifier == "ipcam_region_alram_event")
{
inputView.btnState.Text = Language.StringByID(StringId.quyuruqingaojing);
}
@@ -468,9 +468,15 @@
}
break;
case SPK.Ev_Ipcam:
+ if (inputCondition.identifier == "motiondetect_event")
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.shi);
+ }
+ break;
+ case SPK.Peephole:
if (inputCondition.identifier == "pir_event")
{
- inputView.btnState.Text = Language.StringByID(StringId.On);
+ inputView.btnState.Text = Language.StringByID(StringId.shi);
}
break;
case SPK.SensorPirHold:
@@ -2182,7 +2188,7 @@
}
}
break;
-
+
case SPK.SensorGas:
case SPK.SensorSmoke:
{
@@ -2409,6 +2415,8 @@
button1.Tag = tag;
}
break;
+
+
case SPK.MusicStandard:
case SPK.AvMusic:
{
@@ -2506,9 +2514,9 @@
public string GetTemperatureUnit(Entity.Function device)
{
string unit = string.Empty;
- if (device.GetAttribute("temperature_type") != null && device.GetAttribute("temperature_type").value.Count > 0)
+ if (device.GetAttribute("temperature_type") != null)
{
- unit = device.GetAttribute("temperature_type").value[0];
+ unit = device.GetAttribute("temperature_type").unit;
}
if (string.IsNullOrEmpty(unit))
{
--
Gitblit v1.8.0