From 533735b4bbaea0f7a87ccd3d1781ea7d469f75b5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 06 七月 2021 09:34:37 +0800
Subject: [PATCH] 合并乐橙代码
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 0dede77..cf14834 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -256,7 +256,7 @@
}
}
break;
- case SPK.SensoruUtrasonic:
+ case SPK.SensorUtrasonic:
{
string str = "";
foreach (var dic in dicList)
@@ -295,6 +295,22 @@
}
inputView.btnState.Text = str;
+ }
+ break;
+ case SPK.SenesorMegahealth:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ if (value == "fall")
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.diedao);
+ }
+ else
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.wuren);
+ }
+ }
}
break;
@@ -926,7 +942,7 @@
break;
case "3":
{
- targetView.btnIcon.UnSelectedImagePath = "LogicIcon/delayed.png";
+ targetView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
foreach (var dic in dicList)
{
string value = dic["value"];
@@ -1332,7 +1348,7 @@
}
}
break;
- case SPK.SensoruUtrasonic:
+ case SPK.SensorUtrasonic:
{
foreach (var dic in dicList)
{
@@ -1371,6 +1387,22 @@
}
}
break;
+ case SPK.SenesorMegahealth:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ if (value == "fall")
+ {
+ button1.Text = Language.StringByID(StringId.diedao);
+ }
+ else
+ {
+ button1.Text = Language.StringByID(StringId.wuren);
+ }
+ }
+ }
+ break;
}
}
/// <summary>
--
Gitblit v1.8.0