From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新

---
 HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs |   61 ++++++++++++++++++++++--------
 1 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/ConfirmDialog.cs b/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
similarity index 70%
rename from HDL_ON/UI/UI0-Public/ConfirmDialog.cs
rename to HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
index e3e2527..40f7b1d 100644
--- a/HDL_ON/UI/UI0-Public/ConfirmDialog.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
@@ -6,7 +6,7 @@
 {
     /// <summary>
     /// 閫氱敤浜屾纭鐣岄潰
-    /// 鍙互鑷畾涔夋寜閽枃瀛�
+    /// 鍙互鑷畾涔夋寜閽枃瀛椼�佹彁绀哄唴瀹规敮鎸佸琛屾樉绀�
     /// </summary>
     public class ConfirmDialog : Dialog
     {
@@ -15,21 +15,20 @@
         /// </summary>
         public ConfirmDialog()
         {
-           
+
         }
 
         /// <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()
@@ -46,26 +45,28 @@
 
             Button btnTitle = new Button()
             {
-                Y = Application.GetRealHeight(16),
-                Height = Application.GetRealHeight(30),
+                Y = Application.GetRealHeight(20),
+                Height = Application.GetRealHeight(22),
                 TextColor = CSS_Color.MainColor,
                 TextSize = CSS_FontSize.SubheadingFontSize,
                 TextAlignment = TextAlignment.Center,
                 IsBold = true,
-                TextID = titleId,
+                Text = titleStr,
             };
             contentView.AddChidren(btnTitle);
 
+            //鎻愮ず鍐呭鎸夐挳
             Button btnMsg = new Button()
             {
-                Gravity = Gravity.CenterHorizontal,
-                Height = Application.GetRealHeight(25),
-                Y = btnTitle.Bottom,
-                Width = Application.GetRealHeight(200),
+                Y = btnTitle.Bottom + Application.GetRealHeight(4),
+                X = Application.GetRealWidth(6),
+                Height = Application.GetRealHeight(46),
+                Width = Application.GetRealWidth(258),
                 TextAlignment = TextAlignment.Center,
                 TextColor = CSS_Color.TextualColor,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                TextID = msgId,
+                Text = msgStr,
+                IsMoreLines = true,
             };
             contentView.AddChidren(btnMsg);
 
@@ -107,7 +108,7 @@
             //渚嬶細鍙充笅鍦嗚 澶у皬涓�50
             int mRectCornerID = HDLUtils.RectCornerBottomRight;
             btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
-         
+
             btnCancel.MouseUpEventHandler += (sender, e) =>
             {
                 this.Close();
@@ -131,7 +132,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 +147,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