From 7ff70bc7c9460c395b59952d55df6e5d6a12a718 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 二月 2023 16:27:32 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr'
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs
index d1060d2..93f3500 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs
@@ -132,21 +132,31 @@
// }.Show(MainPage.BaseView);
// return;
//}
- this.btnPictrue.CanClick = false;
- this.btnSwitch.CanClick = false;
-
string statu = this.btnSwitch.IsSelected == true ? "off" : "on";
- HdlThreadLogic.Current.RunThread(() =>
+ string tipMsg = "纭畾鎵撳紑?";
+ if (this.btnSwitch.IsSelected)
{
- var dic = new Dictionary<string, string>();
- dic.Add(FunctionAttributeKey.OnOff, statu);
- Control.Ins.SendWriteCommand(this.device, dic, true);
- HdlThreadLogic.Current.RunMain(() =>
+ tipMsg = "纭畾鍏抽棴?";
+ }
+ Action action = () => {
+
+ this.btnPictrue.CanClick = false;
+ this.btnSwitch.CanClick = false;
+
+ HdlThreadLogic.Current.RunThread(() =>
{
- this.btnPictrue.CanClick = true;
- this.btnSwitch.CanClick = true;
+ var dic = new Dictionary<string, string>();
+ dic.Add(FunctionAttributeKey.OnOff, statu);
+ Control.Ins.SendWriteCommand(this.device, dic, true);
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ this.btnPictrue.CanClick = true;
+ this.btnSwitch.CanClick = true;
+ });
});
- });
+ };
+ new PublicAssmebly().TipOptionMsg(StringId.EmptyString, tipMsg, action);
+
}
#endregion
--
Gitblit v1.8.0