From 7d9e5d946d08f0b53ff25d1c25dcf83efb68b734 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 15 十二月 2020 09:08:59 +0800
Subject: [PATCH] 20201215-1
---
HDL_ON/UI/UI0-Public/AppUnlockPage.cs | 63 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
index c5bd852..13c10e7 100644
--- a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
+++ b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
@@ -9,16 +9,17 @@
{
void LoadOption()
{
- if ( UserInfo.Current == null)
+ //2020-12-12 鏈櫥褰曟垨鑰匒PP鏈惎鍔ㄩ兘杩斿洖锛岃В鍐抽棯閫�闂
+ if ( UserInfo.Current == null || !UserInfo.Current.IsLogin || MainPage.BasePageView == null)
{
return;
}
Action action = () =>
{
- OnAppConfig.Instance.unlockTime = DateTime.Now;
+ UserInfo.Current.unlockTime = DateTime.Now;
};
//1:楠岃瘉鎸囩汗
- if (OnAppConfig.Instance.appUnlockType.Contains("3"))
+ if (UserInfo.Current.appUnlockType.Contains("3"))
{
Action fAction = () =>
{
@@ -31,23 +32,23 @@
if (e == TouchIDUtils.TouchIDState.Success)
{
MainPage.Log("KK:TouchID楠岃瘉鎴愬姛");
- OnAppConfig.Instance.unlockTime = DateTime.Now;
+ UserInfo.Current.unlockTime = DateTime.Now;
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
}
else
{
///灏嗛獙璇佹寚绾圭殑椤甸潰绉婚櫎
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
- if (OnAppConfig.Instance.appUnlockType.Contains("1"))
+ if (UserInfo.Current.appUnlockType.Contains("1"))
{
- var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, action);
+ var page = new AppUnlockPasswordPage(UserInfo.Current.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("7");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
- else if (OnAppConfig.Instance.appUnlockType.Contains("2"))
+ else if (UserInfo.Current.appUnlockType.Contains("2"))
{
- var page = new AppUnlockGesturePage(OnAppConfig.Instance.appUnlockPasswrod, action);
+ var page = new AppUnlockGesturePage(UserInfo.Current.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("7");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -56,20 +57,20 @@
}
};
}
- else if (OnAppConfig.Instance.appUnlockType.Contains("4"))
+ else if (UserInfo.Current.appUnlockType.Contains("4"))
{
//Face ID楠岃瘉
- //
+ //2020-12-11 寰呭鍔犻潰瀹瑰け璐ラ獙璇侀〉闈紝涓嶇劧浼氬鑷撮攣灞忓姞瀵嗘棤鏁�
}
- else if (OnAppConfig.Instance.appUnlockType.Contains("1"))
+ else if (UserInfo.Current.appUnlockType.Contains("1"))
{
- var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, action);
+ var page = new AppUnlockPasswordPage(UserInfo.Current.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("7");
}
- else if (OnAppConfig.Instance.appUnlockType.Contains("2"))
+ else if (UserInfo.Current.appUnlockType.Contains("2"))
{
- var page = new AppUnlockGesturePage(OnAppConfig.Instance.appUnlockPasswrod, action);
+ var page = new AppUnlockGesturePage(UserInfo.Current.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("7");
}
@@ -95,13 +96,27 @@
}
- public void LoadPage()
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="isFirstOpen">濡傛灉鏄涓�娆″惎鍔ㄧ洿鎺ュ脊绐楅獙璇佸瘑鐮�</param>
+ public void LoadPage(bool isFirstOpen = false)
{
- if (OnAppConfig.Instance.unlockTime.AddSeconds(60) > DateTime.Now || OnAppConfig.Instance.appUnlockPasswrod == "" || OnAppConfig.Instance.appUnlockPage.Count == 0)
+ try
{
- return;
+ if (!isFirstOpen)
+ {
+ if (UserInfo.Current.unlockTime.AddMinutes(5) > DateTime.Now || UserInfo.Current.appUnlockPasswrod == "" || UserInfo.Current.appUnlockPage.Count == 0)
+ {
+ return;
+ }
+ }
+ LoadOption();
}
- LoadOption();
+ catch
+ {
+ Utlis.WriteLine("AppUnlockPage error");
+ }
}
/// <summary>
@@ -153,7 +168,7 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS.CSS_Color.MainColor,
TextSize = CSS.CSS_FontSize.TextFontSize,
- TextID = OnAppConfig.Instance.appUnlockType.Contains("1") ? StringId.VerifyDigitalPassword : StringId.VerifyGesturePassword,
+ TextID = UserInfo.Current.appUnlockType.Contains("1") ? StringId.VerifyDigitalPassword : StringId.VerifyGesturePassword,
};
bodyView.AddChidren(btnOtherVerify);
@@ -163,18 +178,18 @@
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
Action action = () =>
{
- OnAppConfig.Instance.unlockTime = DateTime.Now;
+ UserInfo.Current.unlockTime = DateTime.Now;
};
- if (OnAppConfig.Instance.appUnlockType.Contains("1"))
+ if (UserInfo.Current.appUnlockType.Contains("1"))
{
- var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, action);
+ var page = new AppUnlockPasswordPage(UserInfo.Current.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage(optionType);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
- else if (OnAppConfig.Instance.appUnlockType.Contains("2"))
+ else if (UserInfo.Current.appUnlockType.Contains("2"))
{
- var page = new AppUnlockGesturePage(OnAppConfig.Instance.appUnlockPasswrod, action);
+ var page = new AppUnlockGesturePage(UserInfo.Current.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage(optionType);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0