From 6de7f8a29b04737d80ad8cb17804fcc50d267bd9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 十月 2023 14:21:28 +0800
Subject: [PATCH] 2.3版本
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 15 ++++++++++++---
1 files changed, 12 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 345ebdd..f98a94d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -269,11 +269,11 @@
case SPK.SensorHelp:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
- view.btnText.TextID = StringId.qiujiuandzhengchang;
+ view.btnText.TextID = StringId.mubiaozhuangtai;
fLayout.AddChidren(view.FLayoutView());
view.btnClick.MouseUpEventHandler += (sender, e) =>
{
- DeviceView(device, view.btnState, StringId.qiujiu, StringId.zhengchang );
+ DeviceView(device, view.btnState, StringId.qiujiu, StringId.zhengchang ,1);
};
if (edit)
{
@@ -998,11 +998,20 @@
case StringId.onLogic:
{
value = "on";
+ if (device.spk == SPK.SensorDryContact)
+ {
+ value = "open";
+ }
+
}
break;
case StringId.offLogic:
{
value = "off";
+ if (device.spk == SPK.SensorDryContact)
+ {
+ value = "close";
+ }
}
break;
case StringId.youren:
@@ -1116,7 +1125,7 @@
if (device.spk == SPK.SensorLight)
{
//鐓ф槑浼犳劅鍣�
- max =int.MaxValue;
+ max =1200;
}
new LogicView.TipPopView { }.InputBox(textInt, stateValue, (value) =>
--
Gitblit v1.8.0