From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 01 七月 2021 15:50:43 +0800 Subject: [PATCH] Revert "1" --- HDL_ON/UI/MainPage.cs | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs index 47d262e..cc24670 100644 --- a/HDL_ON/UI/MainPage.cs +++ b/HDL_ON/UI/MainPage.cs @@ -18,9 +18,13 @@ /// </summary> public static PageLayout BasePageView { get; set; } /// <summary> + /// 鐢ㄦ埛鎺у埗鐖跺鍣� + /// </summary> + public static UserPage UserBasePage; + /// <summary> /// 鐗堟湰鍙� /// </summary> - public static string VersionString = "1.2.0608"; + public static string VersionString = "1.2.0629"; ///// <summary> ///// 瀹㈡埛绔被鍨� ///// </summary> @@ -268,11 +272,11 @@ #endregion - + //浣撻獙妯″紡 if (NoLoginMode) { //璺宠浆椤甸潰---- - var UserBasePage = new UserPage(); + UserBasePage = new UserPage(); BasePageView.AddChidren(UserBasePage); UserBasePage.LoadPage(); BasePageView.PageIndex = 0; @@ -294,20 +298,20 @@ addResidencePage.LoadView(); return; } - new System.Threading.Thread(() => + new System.Threading.Thread(async () => { try { Entity.FunctionList.List.Clear(); Entity.SpatialInfo.CurrentSpatial.Clear(); ///绛夊緟鑾峰彇浣忓畢淇℃伅 - Application.RunOnMainThread(() => + Application.RunOnMainThread( () => { waitPage.Hide(); waitPage.RemoveFromParent(); //璺宠浆椤甸潰---- - var UserBasePage = new UserPage(); + UserBasePage = new UserPage(); BasePageView.AddChidren(UserBasePage); UserBasePage.LoadPage(); BasePageView.PageIndex = 0; -- Gitblit v1.8.0