From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/UI0-Public/AppUnlockPage.cs | 87 +++++++++++++++++++------------------------
1 files changed, 39 insertions(+), 48 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
index 13cff38..b248f49 100644
--- a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
+++ b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
@@ -7,7 +7,6 @@
/// </summary>
public class AppUnlockPage
{
- DateTime unlockTime = DateTime.MinValue;
void LoadOption()
{
if (MainPage.LoginUser == null)
@@ -16,10 +15,10 @@
}
Action action = () =>
{
- unlockTime = DateTime.Now;
+ OnAppConfig.Instance.unlockTime = DateTime.Now;
};
//1:楠岃瘉鎸囩汗
- if (MainPage.LoginUser.appUnlockType.Contains("3"))
+ if (OnAppConfig.Instance.appUnlockType.Contains("3"))
{
Action fAction = () =>
{
@@ -32,51 +31,47 @@
if (e == TouchIDUtils.TouchIDState.Success)
{
MainPage.Log("KK:TouchID楠岃瘉鎴愬姛");
- unlockTime = DateTime.Now;
- //MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
+ OnAppConfig.Instance.unlockTime = DateTime.Now;
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
}
else
{
///灏嗛獙璇佹寚绾圭殑椤甸潰绉婚櫎
- //MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
+ if (OnAppConfig.Instance.appUnlockType.Contains("1"))
+ {
+ var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, action);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage("7");
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
+ else if (OnAppConfig.Instance.appUnlockType.Contains("2"))
+ {
+ var page = new AppUnlockGesturePage(OnAppConfig.Instance.appUnlockPasswrod, action);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage("7");
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
- 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;
- }
- 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;
- }
}
};
}
- else if (MainPage.LoginUser.appUnlockType.Contains("4"))
+ else if (OnAppConfig.Instance.appUnlockType.Contains("4"))
{
//Face ID楠岃瘉
//
}
- else if (MainPage.LoginUser.appUnlockType.Contains("1"))
+ else if (OnAppConfig.Instance.appUnlockType.Contains("1"))
{
- var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, action);
+ var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("7");
- //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
- else if (MainPage.LoginUser.appUnlockType.Contains("2"))
+ else if (OnAppConfig.Instance.appUnlockType.Contains("2"))
{
- var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, action);
+ var page = new AppUnlockGesturePage(OnAppConfig.Instance.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("7");
- //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
#if __ANDROID__
new System.Threading.Thread(() =>
@@ -86,6 +81,7 @@
{
MainPage.Log($"鍊掕鏃讹細{i} sec");
System.Threading.Thread.Sleep(1000);
+ i++;
}
Application.RunOnMainThread(() =>
{
@@ -94,13 +90,17 @@
})
{ IsBackground = true }.Start();
#else
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
#endif
}
public void LoadPage()
{
+ if (OnAppConfig.Instance.unlockTime.AddSeconds(60) > DateTime.Now || OnAppConfig.Instance.appUnlockPasswrod == "" || OnAppConfig.Instance.appUnlockPage.Count == 0)
+ {
+ return;
+ }
LoadOption();
}
@@ -109,21 +109,11 @@
/// </summary>
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)
- {
- return;
- }
- }
var bodyView = new FrameLayout()
{
BackgroundColor = CSS.CSS_Color.MainBackgroundColor
};
MainPage.BasePageView.AddChidren(bodyView);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
bodyView.AddChidren(new Button()
{
@@ -163,36 +153,37 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS.CSS_Color.MainColor,
TextSize = CSS.CSS_FontSize.TextFontSize,
- TextID = MainPage.LoginUser.appUnlockType.Contains("1") ? StringId.VerifyDigitalPassword : StringId.VerifyGesturePassword
+ TextID = OnAppConfig.Instance.appUnlockType.Contains("1") ? StringId.VerifyDigitalPassword : StringId.VerifyGesturePassword,
};
bodyView.AddChidren(btnOtherVerify);
btnOtherVerify.MouseUpEventHandler = (sender, e) =>
{
///灏嗛獙璇佹寚绾圭殑椤甸潰绉婚櫎
- //MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
-
Action action = () =>
{
- unlockTime = DateTime.Now;
+ OnAppConfig.Instance.unlockTime = DateTime.Now;
};
- if (MainPage.LoginUser.appUnlockType.Contains("1"))
+ if (OnAppConfig.Instance.appUnlockType.Contains("1"))
{
- var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, action);
+ var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage(optionType);
- //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
- else if (MainPage.LoginUser.appUnlockType.Contains("2"))
+ else if (OnAppConfig.Instance.appUnlockType.Contains("2"))
{
- var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, action);
+ var page = new AppUnlockGesturePage(OnAppConfig.Instance.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage(optionType);
- //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
+
};
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
//dialog.Show();
Console.WriteLine("-0987654321");
}
--
Gitblit v1.8.0