From cda2410f9c29f2fadc16e9de38ccae95b75a89dd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 10:51:13 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/MainPage.cs | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index c10c1b8..798e219 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -20,7 +20,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.2.0413";
+ public static string VersionString = "1.2.0608";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -346,12 +346,17 @@
int result = 0;
Application.RunOnMainThread(() =>
{
- if (BaseView.ChildrenCount>1)
+ if (BasePageView == null || BasePageView.ChildrenCount<=1 )
{
- var view = BaseView.GetChildren(BaseView.ChildrenCount - 1);
- if(view.GetType() == typeof(Loading))
+ result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
+ }
+ if (BasePageView.ChildrenCount > 1)
+ {
+ int index = BasePageView.ChildrenCount - 1;
+ var view = BasePageView.GetChildren(index);
+ if (view.GetType() == typeof(Loading))
{
- var loading = view as Loading;
+ var loading = view as Loading;
if (loading.CurStatus == false)//鏈変竴浜涚瓑寰呯晫闈㈤殣钘忎簡锛屼絾鏄病鏈夌Щ闄ゅ埌锛岄渶瑕佸厛绉婚櫎
{
loading.RemoveFromParent();
@@ -362,22 +367,20 @@
result = 1;//姝ｅ湪绛夊緟鏌愪簺鎿嶄綔
}
}
+ else
+ {
+ if (view != null)
+ {
+ if(view.Tag.ToString() != "unlockpage")
+ {
+ view.RemoveFromParent();
+ }
+ }
+ }
}
else
{
- if (BasePageView.ChildrenCount > 1)
- {
- int index = BasePageView.ChildrenCount - 1;
- var view = BasePageView.GetChildren(index);
- if (view != null)
- {
- view.RemoveFromParent();
- }
- }
- else
- {
- result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
- }
+ result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
}
});
return result;
--
Gitblit v1.8.0