From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 八月 2020 14:13:55 +0800
Subject: [PATCH] 20200811
---
HDL_ON/UI/UI0-Public/AppUnlockPage.cs | 80 +++++++++++++++++++++++++++++-----------
1 files changed, 58 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
index 81140a9..6602205 100644
--- a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
+++ b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
@@ -5,22 +5,24 @@
/// <summary>
/// app瑙ｉ攣鐣岄潰
/// </summary>
- public class AppUnlockPage
+ public class AppUnlockPage
{
- DateTime unlockTime = DateTime.MinValue;
- void LoadOption()
+ DateTime unlockTime = DateTime.MinValue;
+ void LoadOption()
{
- if(MainPage.LoginUser == null)
+ if (MainPage.LoginUser == null)
{
return;
}
- Action action = () => {
+ Action action = () =>
+ {
unlockTime = DateTime.Now;
};
//1:楠岃瘉鎸囩汗
if (MainPage.LoginUser.appUnlockType.Contains("3"))
{
- Action fAction = () => {
+ Action fAction = () =>
+ {
LoadOption();
};
LoadGesturePage("7", fAction);
@@ -31,52 +33,77 @@
{
MainPage.Log("KK:TouchID楠岃瘉鎴愬姛");
unlockTime = DateTime.Now;
- MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
+ //MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
+ MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
}
else
{
///灏嗛獙璇佹寚绾圭殑椤甸潰绉婚櫎
- MainPage.BasePageView.RemoveAt( MainPage.BasePageView.ChildrenCount - 1);
+ //MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
+ MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
if (MainPage.LoginUser.appUnlockType.Contains("1"))
{
var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("7");
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
else if (MainPage.LoginUser.appUnlockType.Contains("2"))
{
var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("7");
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
}
};
+ return;
}
else if (MainPage.LoginUser.appUnlockType.Contains("4"))
{
//Face ID楠岃瘉
//
+ return;
}
else if (MainPage.LoginUser.appUnlockType.Contains("1"))
{
var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("7");
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ return;
}
else if (MainPage.LoginUser.appUnlockType.Contains("2"))
{
var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("7");
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ return;
}
+#if __ANDROID__
+ new System.Threading.Thread(() =>
+ {
+ int i = 0;
+ while (i > 1)
+ {
+ MainPage.Log($"鍊掕鏃讹細{i} sec");
+ System.Threading.Thread.Sleep(1000);
+ }
+ Application.RunOnMainThread(() =>
+ {
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ });
+ })
+ { IsBackground = true }.Start();
+#else
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+#endif
+
}
- public void LoadPage()
+ public void LoadPage()
{
LoadOption();
}
@@ -84,8 +111,10 @@
/// <summary>
/// 鍔犺浇鎸囩汗楠岃瘉鐣岄潰
/// </summary>
- public void LoadGesturePage(string optionType,Action fingerAction)
+ public void LoadGesturePage(string optionType, Action fingerAction)
{
+ //Dialog dialog = new Dialog();
+
if (optionType == "7")
{
if (unlockTime.AddSeconds(60) > DateTime.Now || MainPage.LoginUser.appUnlockPasswrod == "" || MainPage.LoginUser.appUnlockPage.Count == 0)
@@ -100,7 +129,8 @@
MainPage.BasePageView.AddChidren(bodyView);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- bodyView.AddChidren(new Button() {
+ bodyView.AddChidren(new Button()
+ {
Height = Application.GetRealHeight(64),
BackgroundColor = CSS.CSS_Color.BackgroundColor,
});
@@ -125,7 +155,8 @@
};
bodyView.AddChidren(btnFingerIcon);
- btnFingerIcon.MouseUpEventHandler = (sender, e) => {
+ btnFingerIcon.MouseUpEventHandler = (sender, e) =>
+ {
fingerAction();
};
@@ -140,11 +171,11 @@
};
bodyView.AddChidren(btnOtherVerify);
- btnOtherVerify.MouseUpEventHandler = (sender, e) => {
- ///灏嗛獙璇佹寚绾圭殑椤甸潰绉婚櫎
- MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
-
- Action action = () => {
+ btnOtherVerify.MouseUpEventHandler = (sender, e) =>
+ {
+
+ Action action = () =>
+ {
unlockTime = DateTime.Now;
};
if (MainPage.LoginUser.appUnlockType.Contains("1"))
@@ -161,8 +192,13 @@
page.LoadPage(optionType);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
+ ///灏嗛獙璇佹寚绾圭殑椤甸潰绉婚櫎
+ //MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
+ MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
};
+ //dialog.Show();
+ Console.WriteLine("-0987654321");
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0