From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 29 八月 2023 09:22:38 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc

---
 HDL_ON/Common/ApiUtlis.cs |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index ec8dcc4..c04aa5a 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -106,8 +106,16 @@
                 {
                     if (waitPage != null)
                     {
-                        waitPage.RemoveFromParent();
-                        waitPage = null;
+                        Application.RunOnMainThread(() =>
+                        {
+                            try
+                            {
+                                waitPage.Hide();
+                                waitPage.RemoveFromParent();
+                                waitPage = null;
+                            }
+                            catch { }
+                        });
                     }
                     MainPage.Log($"鍒锋柊token澶辫触");
                     return;
@@ -119,8 +127,16 @@
                 {
                     if (waitPage != null)
                     {
-                        waitPage.RemoveFromParent();
-                        waitPage = null;
+                        Application.RunOnMainThread(() =>
+                        {
+                            try
+                            {
+                                waitPage.Hide();
+                                waitPage.RemoveFromParent();
+                                waitPage = null;
+                            }
+                            catch { }
+                        });
                     }
                     MainPage.Log($"鍒锋柊浣忓畢淇℃伅澶辫触");
                     return;
@@ -132,8 +148,16 @@
                 {
                     if (waitPage != null)
                     {
-                        waitPage.RemoveFromParent();
-                        waitPage = null;
+                        Application.RunOnMainThread(() =>
+                        {
+                            try
+                            {
+                                waitPage.Hide();
+                                waitPage.RemoveFromParent();
+                                waitPage = null;
+                            }
+                            catch { }
+                        });
                     }
                     MainPage.Log($"鍒锋柊涓汉淇℃伅澶辫触");
                     return;

--
Gitblit v1.8.0