From 1802b849f0dadc81644fb0a706d6fb45efdf2a20 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 24 十一月 2021 16:13:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index 33dacc8..e3b259b 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -412,14 +412,15 @@
})
{ IsBackground = true }.Start();
}
-
/// <summary>
/// 鍔犺浇鎻愮ず寮圭獥
/// </summary>
- /// <param name="titleId"></param>
- /// <param name="msgId"></param>
- public void TipMsg(int titleId, int msgId,Action action = null)
+ /// <param name="title"></param>
+ /// <param name="msg"></param>
+ /// <param name="action"></param>
+ public void TipMsg(string title, string msg, Action action = null)
{
+
Dialog dialog = new Dialog()
{
BackgroundColor = CSS_Color.DialogTransparentColor1,
@@ -445,7 +446,7 @@
TextSize = CSS_FontSize.SubheadingFontSize,
TextAlignment = TextAlignment.Center,
IsBold = true,
- TextID = titleId,
+ Text = title
};
contentView.AddChidren(btnTitle);
@@ -458,7 +459,7 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextID = msgId,
+ Text = msg,
IsMoreLines = true,
};
contentView.AddChidren(btnMsg);
@@ -499,6 +500,18 @@
}
+
+
+ /// <summary>
+ /// 鍔犺浇鎻愮ず寮圭獥
+ /// </summary>
+ /// <param name="titleId"></param>
+ /// <param name="msgId"></param>
+ public void TipMsg(int titleId, int msgId, Action action = null)
+ {
+ TipMsg(Language.StringByID(titleId), Language.StringByID(msgId), action);
+ }
+
/// <summary>
/// 鍔犺浇绛夊緟鐣岄潰
/// </summary>
--
Gitblit v1.8.0