From 5bfb959c47017825c8cf7dc8570c55b04dab694c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:42:11 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into wxr6
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 34 +---------------------------------
1 files changed, 1 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index c888bc1..0dede77 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -297,22 +297,6 @@
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;
}
}
@@ -942,7 +926,7 @@
break;
case "3":
{
- targetView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
+ targetView.btnIcon.UnSelectedImagePath = "LogicIcon/delayed.png";
foreach (var dic in dicList)
{
string value = dic["value"];
@@ -1384,22 +1368,6 @@
}
- }
- }
- 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;
--
Gitblit v1.8.0