From f58a0928df594adb6c9bff6dbc4cb3c37babd104 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 12 四月 2023 10:01:27 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr' into wjc

---
 HDL_ON/UI/MainPage.cs |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index aaaf1c7..f7c57bd 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -211,7 +211,14 @@
         /// </summary>
         public static void GoLoginPage(UserInfo userInfo = null)
         {
-            BaseView.RemoveAll();
+            try
+            {
+                for (int i = 0; i < BaseView.ChildrenCount; i++)
+                {
+                    BaseView.GetChildren(i).RemoveFromParent();
+                }
+            }
+            catch { }
             BaseView.BackgroundColor = CSS_Color.BackgroundColor;
             var fisrtView = new UI.UI1Login.LoginPage();
             fisrtView.BackgroundColor = CSS_Color.MainBackgroundColor;
@@ -226,7 +233,14 @@
         /// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
         public static void GoUserPage(bool downloadData, bool isFirstOpen = false, Action pageShowEvent = null)
         {
-            BaseView.RemoveAll();
+            try
+            {
+                for (int i = 0; i < BaseView.ChildrenCount; i++)
+                {
+                    BaseView.GetChildren(i).RemoveFromParent();
+                }
+            }
+            catch { }
             #region 鍚庨��浜嬩欢
             BasePageView = new PageLayout();
             BasePageView.ScrollEnabled = false;

--
Gitblit v1.8.0