From 6b7a07bcbe147be7ed64994c40bcc5b0a2042aae Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 11:23:35 +0800
Subject: [PATCH] 代码合并-温居城
---
HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs b/HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs
old mode 100755
new mode 100644
index 4931fd3..615bb1d
--- a/HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs
+++ b/HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs
@@ -41,8 +41,9 @@
/// <param name="msg">淇℃伅</param>
/// <param name="action">鍗曞嚮纭鍚庢墽琛岀殑鍥炶皟鍑芥暟</param>
/// <param name="buttonText">鎸夐挳鐨勬枃鏈�</param>
+ /// <param name="buttonCacel">鍙栨秷鎸夐挳鐨勬枃鏈�</param>
/// <param name="i_waitTime">绛夊緟鏃堕棿,鍗曚綅涓虹,璁剧疆纭鎸夐挳鍦ㄥ闀挎椂闂村悗鎵嶈兘澶熺偣鍑�</param>
- public void ShowMassage(ShowMsgType msgType, string msg, Action action = null, string buttonText = null, int i_waitTime = -1)
+ public void ShowMassage(ShowMsgType msgType, string msg, Action action = null, string buttonText = null, string buttonCacel = null, int i_waitTime = -1)
{
//绌哄璞℃椂锛屼笉鏄剧ず
if (string.IsNullOrEmpty(msg))
@@ -51,7 +52,7 @@
}
HdlThreadLogic.Current.RunMain(() =>
{
- var alert = new ShowMsgControl(msgType, msg, buttonText, null, i_waitTime);
+ var alert = new ShowMsgControl(msgType, msg, buttonText, buttonCacel, i_waitTime);
if (action != null)
{
alert.ConfirmClickEvent += () =>
@@ -81,14 +82,14 @@
{
this.ShowMassage(ShowMsgType.Error, "System Error!", () =>
{
- string msg = ex.Message + "\r\n";
- msg += ex.StackTrace;
+ //string msg = ex.Message + "\r\n";
+ //msg += ex.StackTrace;
- var form = new HideOptionFileContentForm();
- form.AddForm(string.Empty);
- form.SetTextContent(msg);
+ //var form = new HideOptionFileContentForm();
+ //form.AddForm(string.Empty);
+ //form.SetTextContent(msg);
- }, "View Log");
+ }, "ok");
}
#endregion
--
Gitblit v1.8.0