From ae86b09b30621e1a8512c6bcdd7e22e9c67a5402 Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期二, 17 五月 2022 14:02:06 +0800
Subject: [PATCH] Merge branch 'dev' into lss
---
HDL_ON/DAL/DriverLayer/Control.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 80397b6..f14125b 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -1290,7 +1290,15 @@
if (pack.Code != StateCode.SUCCESS)
{
Application.RunOnMainThread(() => {
- new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), pack.message);
+ if(string.IsNullOrEmpty(pack.message))
+ {
+ new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip),
+ Language.StringByID(StringId.OperationFailed));
+ }
+ else
+ {
+ new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), pack.message);
+ }
});
}
}
--
Gitblit v1.8.0