From e172a0f48fdd01733e04bda2370846b9f36b840f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 14:44:03 +0800
Subject: [PATCH] 2021-10-15 1.修改乐橙推送字段，psk参数取值不能取cname和deviceName
---
HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs b/HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs
index 4cbc8da..615bb1d 100644
--- 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 += () =>
--
Gitblit v1.8.0