From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4
---
HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index e81f6c7..a8c069b 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -39,10 +39,6 @@
}
if (string.IsNullOrEmpty(text) || list.Contains(text))
{
- //if (titleId == StringId.ModifyMemberNickname)
- //{
- // return;
- //}
string tipMsgString = "";
if (string.IsNullOrEmpty(text))
{
@@ -77,7 +73,7 @@
/// 淇濆瓨鎸夐挳浜嬩欢闇�瑕佸皢
/// </summary>
/// <param name="callBackAction">鍥炶皟鍑芥暟</param>
- public void LoadDialog_EditParater(int titleId, string editParater, Action<string> callBackAction, int errorId_IsNullOrEmpty, int errorId_ContainsPar, List<string> baseList, bool encryption = false)
+ public void LoadDialog_EditParater(int titleId, string editParater, Action<string> callBackAction, int errorId_IsNullOrEmpty, int errorId_ContainsPar, List<string> baseList, bool encryption = false, string confirmText = "")
{
Dialog dialog = new Dialog()
{
@@ -210,6 +206,13 @@
TextID = StringId.Confirm,
};
contentView.AddChidren(btnConfirm);
+
+ //鑷畾涔塨tnConfirm鏍囬
+ if (!string.IsNullOrEmpty(confirmText))
+ {
+ btnConfirm.Text = confirmText;
+ }
+
int mRectCornerID = HDLUtils.RectCornerBottomRight;
btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
--
Gitblit v1.8.0