From e3f3f62315a5789cd812b96954b67bffda4a0f5a Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 01 四月 2021 16:33:55 +0800
Subject: [PATCH] 金辉项目，萤石摄像头更新

---
 HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs |   46 +++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs b/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
index 40f7b1d..3961438 100644
--- a/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘�
+using System;
 using Shared;
 using HDL_ON.UI.CSS;
 
@@ -10,6 +11,10 @@
     /// </summary>
     public class ConfirmDialog : Dialog
     {
+        /// bodyView
+        /// </summary>
+        FrameLayout bodyView;
+
         /// <summary>
         /// 
         /// </summary>
@@ -31,6 +36,14 @@
         {
             this.BackgroundColor = CSS_Color.DialogTransparentColor1;
 
+            if (bodyView != null && bodyView.Parent != null)
+            {
+                bodyView.RemoveFromParent();
+            }
+
+            bodyView = new FrameLayout();
+            this.AddChidren(bodyView);
+
             FrameLayout contentView = new FrameLayout()
             {
                 Gravity = Gravity.Center,
@@ -41,7 +54,7 @@
                 BorderWidth = 0,
                 Radius = (uint)Application.GetMinRealAverage(10),
             };
-            this.AddChidren(contentView);
+            bodyView.AddChidren(contentView);
 
             Button btnTitle = new Button()
             {
@@ -54,7 +67,7 @@
                 Text = titleStr,
             };
             contentView.AddChidren(btnTitle);
-
+            int Width135 = Application.GetRealWidth(135);
             //鎻愮ず鍐呭鎸夐挳
             Button btnMsg = new Button()
             {
@@ -82,7 +95,7 @@
             Button btnCancel = new Button()
             {
                 Y = btnLine.Bottom,
-                Width = Application.GetRealWidth(135),
+                Width = Width135,
                 Height = Application.GetRealHeight(43),
                 TextAlignment = TextAlignment.Center,
                 TextColor = CSS_Color.TextualColor,
@@ -93,9 +106,9 @@
 
             Button btnConfirm = new Button()
             {
-                X = btnCancel.Right,
+                X = contentView.Width - Width135,
                 Y = btnLine.Y,
-                Width = Application.GetRealWidth(135),
+                Width = Width135,
                 Height = Application.GetRealHeight(45),
                 TextAlignment = TextAlignment.Center,
                 //TextColor = CSS_Color.TextualColor,
@@ -121,7 +134,7 @@
                 okAction?.Invoke();
             };
 
-            this.Show();
+            //this.Show();
         }
 
         /// <summary>
@@ -133,6 +146,7 @@
         public void ShowDialog(int titleId, int msgId, Action okAction, Action cancelAction = null)
         {
             this.ShowDialogBase(Language.StringByID(titleId), Language.StringByID(msgId), okAction, cancelAction);
+            this.Show();
         }
 
         /// <summary>
@@ -148,6 +162,7 @@
         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);
+            this.Show();
         }
 
         /// <summary>
@@ -159,6 +174,7 @@
         public void ShowDialog(string titleStr, string msgStr, Action okAction, Action cancelAction = null)
         {
             this.ShowDialogBase(titleStr, msgStr, okAction, cancelAction);
+            this.Show();
         }
 
         /// <summary>
@@ -174,7 +190,23 @@
         public void ShowDialog(string titleStr, string msgStr, Action okAction, Action cancelAction, int cancelID, int confirmID)
         {
             this.ShowDialogBase(titleStr, msgStr, okAction, cancelAction, cancelID, confirmID);
+            this.Show();
         }
 
+        /// <summary>
+        /// RefreshDialog 鍦―ialog娌″叧闂儏鍐典笅璋冪敤
+        /// 鍙互鑷畾涔夋寜閽枃瀛�
+        /// </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 RefreshDialog(string titleStr, string msgStr, Action okAction, Action cancelAction, int cancelID, int confirmID)
+        {
+            this.ShowDialogBase(titleStr, msgStr, okAction, cancelAction, cancelID, confirmID);
+            //this.Show();涓嶉渶瑕乻how
+        }
     }
 }

--
Gitblit v1.8.0