From cae4d4b5b508a666fbd0dff3c2a981fdff841bc8 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 30 三月 2023 13:10:33 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc

---
 HDL_ON/UI/UI0-Public/PublicAssmebly.cs |  169 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 94 insertions(+), 75 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index 7c35a74..1bd77d6 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -546,86 +546,105 @@
         /// <param name="title"></param>
         /// <param name="msg"></param>
         /// <param name="action"></param>
-        public void TipMsg(string title, string msg, Action action = null)
+        public void TipMsg(string title, string msg, Action action = null,bool again = true)
         {
-
-            Dialog dialog = new Dialog()
+            try
             {
-                BackgroundColor = CSS_Color.DialogTransparentColor1,
-            };
+                Dialog dialog = new Dialog()
+                {
+                    BackgroundColor = CSS_Color.DialogTransparentColor1,
+                };
 
-            FrameLayout contentView = new FrameLayout()
+                FrameLayout contentView = new FrameLayout()
+                {
+                    Gravity = Gravity.Center,
+                    Width = Application.GetRealWidth(270),
+                    Height = Application.GetRealHeight(140),
+                    BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
+                    BorderColor = 0x00000000,
+                    BorderWidth = 0,
+                    Radius = (uint)Application.GetMinRealAverage(10),
+                };
+                dialog.AddChidren(contentView);
+
+                Button btnTitle = new Button()
+                {
+                    Y = Application.GetRealHeight(16),
+                    Height = Application.GetRealHeight(30),
+                    TextColor = CSS_Color.MainColor,
+                    TextSize = CSS_FontSize.SubheadingFontSize,
+                    TextAlignment = TextAlignment.Center,
+                    IsBold = true,
+                    Text = title
+                };
+                contentView.AddChidren(btnTitle);
+
+                Button btnMsg = new Button()
+                {
+                    Gravity = Gravity.CenterHorizontal,
+                    Height = Application.GetRealHeight(35),
+                    Y = btnTitle.Bottom,
+                    Width = Application.GetRealHeight(200),
+                    TextAlignment = TextAlignment.Center,
+                    TextColor = CSS_Color.TextualColor,
+                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                    Text = msg,
+                    IsMoreLines = true,
+                };
+                contentView.AddChidren(btnMsg);
+
+                Button btnLine = new Button()
+                {
+                    Y = Application.GetRealHeight(96),
+                    Height = Application.GetRealHeight(1),
+                    BackgroundColor = CSS.CSS_Color.DividingLineColor,
+                };
+                contentView.AddChidren(btnLine);
+
+                Button btnConfirm = new Button()
+                {
+                    Y = btnLine.Bottom,
+                    Height = Application.GetRealHeight(43),
+                    TextAlignment = TextAlignment.Center,
+                    TextColor = CSS_Color.TextualColor,
+                    TextSize = CSS_FontSize.SubheadingFontSize,
+                    SelectedTextColor = CSS_Color.MainBackgroundColor,
+                    SelectedBackgroundColor = CSS_Color.MainColor,
+                    TextID = StringId.Confirm,
+                };
+                contentView.AddChidren(btnConfirm);
+
+                dialog.Show();
+
+                btnConfirm.MouseDownEventHandler += (sender, e) =>
+                {
+                    btnConfirm.IsSelected = true;
+                };
+                btnConfirm.MouseUpEventHandler += (sender, e) =>
+                {
+                    btnConfirm.IsSelected = false;
+                    action?.Invoke();
+                    dialog.Close();
+                };
+            }catch(Exception ex)
             {
-                Gravity = Gravity.Center,
-                Width = Application.GetRealWidth(270),
-                Height = Application.GetRealHeight(140),
-                BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
-                BorderColor = 0x00000000,
-                BorderWidth = 0,
-                Radius = (uint)Application.GetMinRealAverage(10),
-            };
-            dialog.AddChidren(contentView);
-
-            Button btnTitle = new Button()
+                MainPage.Log($"lc add fail:{ex.Message}");
+                if (again)
+                {
+                    new System.Threading.Thread(() =>
+                    {
+                        System.Threading.Thread.Sleep(500);
+                        Application.RunOnMainThread(() =>
+                        {
+                            TipMsg(title, msg, action, false);
+                        });
+                    }).Start() ;
+                }
+            }
+            finally
             {
-                Y = Application.GetRealHeight(16),
-                Height = Application.GetRealHeight(30),
-                TextColor = CSS_Color.MainColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextAlignment = TextAlignment.Center,
-                IsBold = true,
-                Text = title
-            };
-            contentView.AddChidren(btnTitle);
-
-            Button btnMsg = new Button()
-            {
-                Gravity = Gravity.CenterHorizontal,
-                Height = Application.GetRealHeight(35),
-                Y = btnTitle.Bottom,
-                Width = Application.GetRealHeight(200),
-                TextAlignment = TextAlignment.Center,
-                TextColor = CSS_Color.TextualColor,
-                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                Text = msg,
-                IsMoreLines = true,
-            };
-            contentView.AddChidren(btnMsg);
-
-            Button btnLine = new Button()
-            {
-                Y = Application.GetRealHeight(96),
-                Height = Application.GetRealHeight(1),
-                BackgroundColor = CSS.CSS_Color.DividingLineColor,
-            };
-            contentView.AddChidren(btnLine);
-
-            Button btnConfirm = new Button()
-            {
-                Y = btnLine.Bottom,
-                Height = Application.GetRealHeight(43),
-                TextAlignment = TextAlignment.Center,
-                TextColor = CSS_Color.TextualColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                SelectedTextColor = CSS_Color.MainBackgroundColor,
-                SelectedBackgroundColor = CSS_Color.MainColor,
-                TextID = StringId.Confirm,
-            };
-            contentView.AddChidren(btnConfirm);
-
-            dialog.Show();
-
-            btnConfirm.MouseDownEventHandler += (sender, e) =>
-            {
-                btnConfirm.IsSelected = true;
-            };
-            btnConfirm.MouseUpEventHandler += (sender, e) =>
-            {
-                btnConfirm.IsSelected = false;
-                action?.Invoke();
-                dialog.Close();
-            };
-
+                
+            }
         }
 
 

--
Gitblit v1.8.0