From a6bad443ca7e9d01ebf22e1a0b2452b9e25120e7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 15:40:13 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs | 86 ++++++++++++---------
HDL_ON/UI/UI0-Public/AppUnlockPage.cs | 109 ++++++++++++++++++---------
2 files changed, 121 insertions(+), 74 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
index 63a6b1d..5b1b28d 100644
--- a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
+++ b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
@@ -103,7 +103,7 @@
TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
};
//鍔犺浇UI椤甸潰
- LoadGesturePage("7", fingerAction);
+ LoadGesturePage("7", fingerAction, null);
TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = (sender1, e) =>
@@ -140,7 +140,10 @@
/// <summary>
/// 鍔犺浇鎸囩汗楠岃瘉鐣岄潰
/// </summary>
- public void LoadGesturePage(string optionType, Action fingerAction)
+ /// <param name="optionType"></param>
+ /// <param name="fingerAction"></param>
+ /// <param name="successAction"></param>
+ public void LoadGesturePage(string optionType, Action fingerAction, Action successAction)
{
var bodyView = new FrameLayout()
{
@@ -194,25 +197,37 @@
{
///灏嗛獙璇佹寚绾圭殑椤甸潰绉婚櫎
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
- Action action = () =>
- {
- UserInfo.Current.unlockTime = DateTime.Now;
- };
- if (UserInfo.Current.appUnlockType.Contains("1"))
- {
- var page = new AppUnlockPasswordPage(UserInfo.Current.appUnlockPasswrod, action);
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage(optionType);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- }
- else if (UserInfo.Current.appUnlockType.Contains("2"))
- {
- var page = new AppUnlockGesturePage(UserInfo.Current.appUnlockPasswrod, action);
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage(optionType);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- }
+ //Action action = () =>
+ //{
+ // UserInfo.Current.unlockTime = DateTime.Now;
+ //};
+ //if (UserInfo.Current.appUnlockType.Contains("1"))
+ //{
+ // var page = new AppUnlockPasswordPage(UserInfo.Current.appUnlockPasswrod, action);
+ // MainPage.BasePageView.AddChidren(page);
+ // page.LoadPage(optionType);
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //}
+ //else if (UserInfo.Current.appUnlockType.Contains("2"))
+ //{
+ // var page = new AppUnlockGesturePage(UserInfo.Current.appUnlockPasswrod, action);
+ // MainPage.BasePageView.AddChidren(page);
+ // page.LoadPage(optionType);
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //}
+ if (successAction == null)
+ {
+ Action action = () =>
+ {
+ UserInfo.Current.unlockTime = DateTime.Now;
+ };
+ GotogoToVerifyPasswordPage(optionType, action);
+ }
+ else
+ {
+ GotogoToVerifyPasswordPage(optionType, successAction);
+ }
};
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -238,7 +253,7 @@
TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.VerifyFaceID));
};
//鍔犺浇UI椤甸潰
- LoadFaceIDGesturePage("7", faceIDAction);
+ LoadFaceIDGesturePage("7", faceIDAction, null);
TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.VerifyFaceID));
TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = (sender1, e) =>
@@ -273,9 +288,12 @@
}
/// <summary>
- /// 鍔犺浇闈㈠ID楠岃瘉鐣岄潰
+ /// 鍔犺浇闈㈠ID楠岃瘉鐣岄潰
/// </summary>
- public void LoadFaceIDGesturePage(string optionType, Action faceIDAction)
+ /// <param name="optionType"></param>
+ /// <param name="faceIDAction"></param>
+ /// <param name="successAction">鎸囧畾鎴愬姛鐨勪簨浠跺洖璋�</param>
+ public void LoadFaceIDGesturePage(string optionType, Action faceIDAction, Action successAction)
{
var bodyView = new FrameLayout()
{
@@ -329,23 +347,18 @@
{
///灏嗛獙璇侀潰瀹笽D鐨勯〉闈㈢Щ闄�
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
- Action action = () =>
+
+ if (successAction == null)
{
- UserInfo.Current.unlockTime = DateTime.Now;
- };
- if (UserInfo.Current.appUnlockType.Contains("1"))
- {
- var page = new AppUnlockPasswordPage(UserInfo.Current.appUnlockPasswrod, action);
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage(optionType);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ Action action = () =>
+ {
+ UserInfo.Current.unlockTime = DateTime.Now;
+ };
+ GotogoToVerifyPasswordPage(optionType, action);
}
- else if (UserInfo.Current.appUnlockType.Contains("2"))
+ else
{
- var page = new AppUnlockGesturePage(UserInfo.Current.appUnlockPasswrod, action);
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage(optionType);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ GotogoToVerifyPasswordPage(optionType, successAction);
}
};
@@ -354,5 +367,27 @@
}
+ /// <summary>
+ /// 璺宠浆鎵嬪娍鎴栬�呭瘑鐮侀獙璇佺晫闈�
+ /// </summary>
+ /// <param name="optionType">1:璁剧疆瀵嗙爜锛�2:楠岃瘉瀵嗙爜;3:鍏抽棴瀵嗙爜;4:鍏抽棴瑙ｉ攣璁剧疆;5:鎸囩汗ID寮�鍏筹紱6:闈㈠ID寮�鍏�;7:瑙ｉ攣楠岃瘉</param>
+ /// <param name="successAction"></param>
+ void GotogoToVerifyPasswordPage(string optionType, Action successAction)
+ {
+ if (UserInfo.Current.appUnlockType.Contains("1"))
+ {
+ var page = new AppUnlockPasswordPage(UserInfo.Current.appUnlockPasswrod, successAction);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage(optionType);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
+ else if (UserInfo.Current.appUnlockType.Contains("2"))
+ {
+ var page = new AppUnlockGesturePage(UserInfo.Current.appUnlockPasswrod, successAction);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage(optionType);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
index 0ef85c1..0594119 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
@@ -330,11 +330,33 @@
//4:闈㈠ID
string faceIDUnlockType = "4";
+ //鎴愬姛浜嬩欢
+ Action successAction = () =>
+ {
+ var result = btnFaceIdUnlockSwtichIcon.IsSelected = !btnFaceIdUnlockSwtichIcon.IsSelected;
+ if (result)
+ {
+ if (!UserInfo.Current.appUnlockType.Contains(faceIDUnlockType))
+ {
+ UserInfo.Current.appUnlockType.Add(faceIDUnlockType);
+ UserInfo.Current.SaveUserInfo();
+ }
+ }
+ else
+ {
+ if (UserInfo.Current.appUnlockType.Contains(faceIDUnlockType))
+ {
+ UserInfo.Current.appUnlockType.Remove(faceIDUnlockType);
+ UserInfo.Current.SaveUserInfo();
+ }
+ }
+ };
+
Action fingerAction = () =>
{
TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.VerifyFaceID));
};
- new AppUnlockPage().LoadFaceIDGesturePage(optionType, fingerAction);
+ new AppUnlockPage().LoadFaceIDGesturePage(optionType, fingerAction, successAction);
TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.VerifyFaceID));
@@ -342,24 +364,7 @@
{
if (e == TouchIDUtils.TouchIDState.Success)
{
- var result = btnFaceIdUnlockSwtichIcon.IsSelected = !btnFaceIdUnlockSwtichIcon.IsSelected;
- if (result)
- {
- if (!UserInfo.Current.appUnlockType.Contains(faceIDUnlockType))
- {
- UserInfo.Current.appUnlockType.Add(faceIDUnlockType);
- UserInfo.Current.SaveUserInfo();
- }
- }
- else
- {
- if (UserInfo.Current.appUnlockType.Contains(faceIDUnlockType))
- {
- UserInfo.Current.appUnlockType.Remove(faceIDUnlockType);
- UserInfo.Current.SaveUserInfo();
- }
- }
- //MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
+ successAction?.Invoke();
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
}
else// if (e == TouchIDUtils.TouchIDState.InputPassword || e == TouchIDUtils.TouchIDState.TouchIDLockout)
@@ -413,12 +418,34 @@
{
//5:鎸囩汗ID寮�鍏�
string optionType = "5";
+ //鎴愬姛浜嬩欢
+ Action successAction = () =>
+ {
+ var result = btnFingerprintUnlockSwtichIcon.IsSelected = !btnFingerprintUnlockSwtichIcon.IsSelected;
+ if (result)
+ {
+ if (!UserInfo.Current.appUnlockType.Contains("3"))
+ {
+ UserInfo.Current.appUnlockType.Add("3");
+ UserInfo.Current.SaveUserInfo();
+ }
+ }
+ else
+ {
+ if (UserInfo.Current.appUnlockType.Contains("3"))
+ {
+ UserInfo.Current.appUnlockType.Remove("3");
+ UserInfo.Current.SaveUserInfo();
+ }
+ }
+ };
+
Action fingerAction = () =>
{
TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
};
- new AppUnlockPage().LoadGesturePage(optionType, fingerAction);
+ new AppUnlockPage().LoadGesturePage(optionType, fingerAction, successAction);
TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
@@ -426,23 +453,8 @@
{
if (e == TouchIDUtils.TouchIDState.Success)
{
- var result = btnFingerprintUnlockSwtichIcon.IsSelected = !btnFingerprintUnlockSwtichIcon.IsSelected;
- if (result)
- {
- if (!UserInfo.Current.appUnlockType.Contains("3"))
- {
- UserInfo.Current.appUnlockType.Add("3");
- UserInfo.Current.SaveUserInfo();
- }
- }
- else
- {
- if (UserInfo.Current.appUnlockType.Contains("3"))
- {
- UserInfo.Current.appUnlockType.Remove("3");
- UserInfo.Current.SaveUserInfo();
- }
- }
+ successAction?.Invoke();
+
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
}
else// if (e == TouchIDUtils.TouchIDState.InputPassword || e == TouchIDUtils.TouchIDState.TouchIDLockout)
--
Gitblit v1.8.0