From 4e6dfedede622d018b0aec0fb85c130d47cf45ba Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 25 十一月 2020 16:14:39 +0800
Subject: [PATCH] 2020-11-25 1.增加服务器信息、关于ON、功能介绍、投诉、检测更新。
---
HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/ConfirmDialog.cs b/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
similarity index 76%
rename from HDL_ON/UI/UI0-Public/ConfirmDialog.cs
rename to HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
index e3e2527..865e6dc 100644
--- a/HDL_ON/UI/UI0-Public/ConfirmDialog.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
@@ -21,15 +21,14 @@
/// <summary>
/// 鍒濆鍖朌ialog
/// </summary>
- /// <param name="titleId"></param>
- /// <param name="msgId"></param>
+ /// <param name="titleStr"></param>
+ /// <param name="msgStr"></param>
/// <param name="okAction"></param>
/// <param name="cancelAction"></param>
/// <param name="cancelID"></param>
/// <param name="confirmID"></param>
- void ShowDialogBase(int titleId, int msgId, Action okAction, Action cancelAction, int cancelID = StringId.Cancel, int confirmID = StringId.Confirm)
+ void ShowDialogBase(string titleStr, string msgStr, Action okAction, Action cancelAction, int cancelID = StringId.Cancel, int confirmID = StringId.Confirm)
{
-
this.BackgroundColor = CSS_Color.DialogTransparentColor1;
FrameLayout contentView = new FrameLayout()
@@ -52,7 +51,7 @@
TextSize = CSS_FontSize.SubheadingFontSize,
TextAlignment = TextAlignment.Center,
IsBold = true,
- TextID = titleId,
+ Text = titleStr,
};
contentView.AddChidren(btnTitle);
@@ -65,7 +64,7 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextID = msgId,
+ Text = msgStr,
};
contentView.AddChidren(btnMsg);
@@ -107,7 +106,7 @@
//渚嬶細鍙充笅鍦嗚 澶у皬涓�50
int mRectCornerID = HDLUtils.RectCornerBottomRight;
btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
-
+
btnCancel.MouseUpEventHandler += (sender, e) =>
{
this.Close();
@@ -131,7 +130,7 @@
/// <param name="callBackAction"></param>
public void ShowDialog(int titleId, int msgId, Action okAction, Action cancelAction = null)
{
- this.ShowDialogBase(titleId, msgId, okAction, cancelAction);
+ this.ShowDialogBase(Language.StringByID(titleId), Language.StringByID(msgId), okAction, cancelAction);
}
/// <summary>
@@ -146,7 +145,33 @@
/// <param name="confirmID"></param>
public void ShowDialog(int titleId, int msgId, Action okAction, Action cancelAction, int cancelID, int confirmID)
{
- this.ShowDialogBase(titleId, msgId, okAction, cancelAction, cancelID, confirmID);
+ this.ShowDialogBase(Language.StringByID(titleId), Language.StringByID(msgId), okAction, cancelAction, cancelID, confirmID);
+ }
+
+ /// <summary>
+ /// 鍔犺浇鎻愮ずDialog
+ /// </summary>
+ /// <param name="titleId"></param>
+ /// <param name="msgId"></param>
+ /// <param name="callBackAction"></param>
+ public void ShowDialog(string titleStr, string msgStr, Action okAction, Action cancelAction = null)
+ {
+ this.ShowDialogBase(titleStr, msgStr, okAction, cancelAction);
+ }
+
+ /// <summary>
+ /// 鍔犺浇鎻愮ずDialog
+ /// 鍙互鑷畾涔夋寜閽枃瀛�
+ /// </summary>
+ /// <param name="titleStr"></param>
+ /// <param name="msgStr"></param>
+ /// <param name="okAction"></param>
+ /// <param name="cancelAction"></param>
+ /// <param name="cancelID"></param>
+ /// <param name="confirmID"></param>
+ public void ShowDialog(string titleStr, string msgStr, Action okAction, Action cancelAction, int cancelID, int confirmID)
+ {
+ this.ShowDialogBase(titleStr, msgStr, okAction, cancelAction, cancelID, confirmID);
}
}
--
Gitblit v1.8.0