From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs
index 93f3500..d457f62 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs
@@ -138,6 +138,13 @@
{
tipMsg = "纭畾鍏抽棴?";
}
+ if (Language.CurrentLanguage != "Chinese")
+ {
+
+ tipMsg = "Are you sure to close?";
+ if (this.btnSwitch.IsSelected)
+ tipMsg = "Are you sure to open it?";
+ }
Action action = () => {
this.btnPictrue.CanClick = false;
@@ -147,7 +154,7 @@
{
var dic = new Dictionary<string, string>();
dic.Add(FunctionAttributeKey.OnOff, statu);
- Control.Ins.SendWriteCommand(this.device, dic, true);
+ Control.Ins.SendWriteCommand(this.device, dic);
HdlThreadLogic.Current.RunMain(() =>
{
this.btnPictrue.CanClick = true;
@@ -155,7 +162,7 @@
});
});
};
- new PublicAssmebly().TipOptionMsg(StringId.EmptyString, tipMsg, action);
+ new PublicAssmebly().TipOptionMsg(StringId.Tip, tipMsg, action);
}
--
Gitblit v1.8.0