From e87985ec1dcb69beedaf9f95e8e7aba14b7c08d6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 09 十二月 2020 18:50:14 +0800
Subject: [PATCH] 2020-12-09 1.信息中心，增加下划线和点击Alter提醒详情。
---
HDL_ON/UI/UI0-Public/AppUnlockPage.cs | 52 +++++++++++++++++++++++-----------------------------
1 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
index a36a036..c5bd852 100644
--- a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
+++ b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
@@ -7,19 +7,18 @@
/// </summary>
public class AppUnlockPage
{
- DateTime unlockTime = DateTime.MinValue;
void LoadOption()
{
- if (MainPage.LoginUser == null)
+ if ( UserInfo.Current == null)
{
return;
}
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,23 +31,23 @@
if (e == TouchIDUtils.TouchIDState.Success)
{
MainPage.Log("KK:TouchID楠岃瘉鎴愬姛");
- unlockTime = DateTime.Now;
+ OnAppConfig.Instance.unlockTime = DateTime.Now;
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
}
else
{
///灏嗛獙璇佹寚绾圭殑椤甸潰绉婚櫎
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
- 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("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;
@@ -57,20 +56,20 @@
}
};
}
- 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");
}
- 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");
}
@@ -98,6 +97,10 @@
public void LoadPage()
{
+ if (OnAppConfig.Instance.unlockTime.AddSeconds(60) > DateTime.Now || OnAppConfig.Instance.appUnlockPasswrod == "" || OnAppConfig.Instance.appUnlockPage.Count == 0)
+ {
+ return;
+ }
LoadOption();
}
@@ -106,15 +109,6 @@
/// </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
@@ -159,7 +153,7 @@
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);
@@ -169,18 +163,18 @@
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;
}
- 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;
--
Gitblit v1.8.0