From cb6e11c5067ecaba4d8f9907989154167c1e8943 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 09 六月 2021 17:15:05 +0800 Subject: [PATCH] Merge branch 'wxr4' into dev-tzy --- HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 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 0dede77..c888bc1 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs @@ -297,6 +297,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"]; @@ -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