From 1293fea19c6a2b558986856e301d5218c1979692 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:08:43 +0800
Subject: [PATCH] Revert "20201127 接受bus数据修改完成，搜索网关、一端口修改完成"
---
HDL_ON/UI/UI0-Public/ConfirmDialog.cs | 43 +++++++++----------------------------------
1 files changed, 9 insertions(+), 34 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs b/HDL_ON/UI/UI0-Public/ConfirmDialog.cs
similarity index 76%
rename from HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
rename to HDL_ON/UI/UI0-Public/ConfirmDialog.cs
index 865e6dc..e3e2527 100644
--- a/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
+++ b/HDL_ON/UI/UI0-Public/ConfirmDialog.cs
@@ -21,14 +21,15 @@
/// <summary>
/// 鍒濆鍖朌ialog
/// </summary>
- /// <param name="titleStr"></param>
- /// <param name="msgStr"></param>
+ /// <param name="titleId"></param>
+ /// <param name="msgId"></param>
/// <param name="okAction"></param>
/// <param name="cancelAction"></param>
/// <param name="cancelID"></param>
/// <param name="confirmID"></param>
- void ShowDialogBase(string titleStr, string msgStr, Action okAction, Action cancelAction, int cancelID = StringId.Cancel, int confirmID = StringId.Confirm)
+ void ShowDialogBase(int titleId, int msgId, Action okAction, Action cancelAction, int cancelID = StringId.Cancel, int confirmID = StringId.Confirm)
{
+
this.BackgroundColor = CSS_Color.DialogTransparentColor1;
FrameLayout contentView = new FrameLayout()
@@ -51,7 +52,7 @@
TextSize = CSS_FontSize.SubheadingFontSize,
TextAlignment = TextAlignment.Center,
IsBold = true,
- Text = titleStr,
+ TextID = titleId,
};
contentView.AddChidren(btnTitle);
@@ -64,7 +65,7 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = msgStr,
+ TextID = msgId,
};
contentView.AddChidren(btnMsg);
@@ -106,7 +107,7 @@
//渚嬶細鍙充笅鍦嗚 澶у皬涓�50
int mRectCornerID = HDLUtils.RectCornerBottomRight;
btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
-
+
btnCancel.MouseUpEventHandler += (sender, e) =>
{
this.Close();
@@ -130,7 +131,7 @@
/// <param name="callBackAction"></param>
public void ShowDialog(int titleId, int msgId, Action okAction, Action cancelAction = null)
{
- this.ShowDialogBase(Language.StringByID(titleId), Language.StringByID(msgId), okAction, cancelAction);
+ this.ShowDialogBase(titleId, msgId, okAction, cancelAction);
}
/// <summary>
@@ -145,33 +146,7 @@
/// <param name="confirmID"></param>
public void ShowDialog(int titleId, int msgId, Action okAction, Action cancelAction, int cancelID, int 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);
+ this.ShowDialogBase(titleId, msgId, okAction, cancelAction, cancelID, confirmID);
}
}
--
Gitblit v1.8.0