From 98c51b309741620d7a9d6bf6260327a6041b8f12 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 22 七月 2022 17:48:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into release0123
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index eb1cc55..a6402bb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -2036,11 +2036,11 @@
{
if (value == "true")
{
- button1.Text = Language.StringByID(StringId.zaixian);
+ button2.Text = Language.StringByID(StringId.zaixian);
}
else
{
- button1.Text = Language.StringByID(StringId.buzaixian);
+ button2.Text = Language.StringByID(StringId.buzaixian);
}
}
break;
@@ -2057,26 +2057,28 @@
string value = dic["value"];
switch (dic["key"])
{
- case "people_status":
- {
- if (value == "true")
- {
- button1.Text = Language.StringByID(StringId.youren);
- }
- else {
- button1.Text = Language.StringByID(StringId.wuren);
- }
-
- }
- break;
+
case "target_status":
{
if (value == "4")
{
- button2.Text = Language.StringByID(StringId.shi);
+ button1.Text = Language.StringByID(StringId.shi);
}
}
break;
+ case "people_status":
+ {
+ if (value == "true")
+ {
+ button2.Text = Language.StringByID(StringId.youren);
+ }
+ else
+ {
+ button2.Text = Language.StringByID(StringId.wuren);
+ }
+
+ }
+ break;
}
}
--
Gitblit v1.8.0