From f5a49299caaf1fdca7503ae682da13c6fda887c6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 20:55:55 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs | 227 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 125 insertions(+), 102 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
index 0594119..d045730 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
@@ -321,76 +321,16 @@
}
/// <summary>
- /// 闈㈠ID寮�鍚拰鍏抽棴
+ /// 闈㈠ID楠岃瘉寮圭獥
/// </summary>
- void FaceIDVerification_SwtichOnOff()
+ /// <param name="successAction"></param>
+ /// <param name="goToVerifyPasswordAction"></param>
+ void FaceIDVerification_Show(Action successAction, Action goToVerifyPasswordAction)
{
- //6:闈㈠ID寮�鍏�
- string optionType = "6";
- //4:闈㈠ID
- string faceIDUnlockType = "4";
+ //鎻愮ず鏁板瓧瀵嗙爜楠岃瘉杩樻槸缁樺埗鎵嬪娍楠岃瘉
+ string verificationTitleString = GetVerificationTitleString();
- //鎴愬姛浜嬩欢
- 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, successAction);
-
- TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.VerifyFaceID));
-
- TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = (sender1, e) =>
- {
- if (e == TouchIDUtils.TouchIDState.Success)
- {
- successAction?.Invoke();
- MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
- }
- else// if (e == TouchIDUtils.TouchIDState.InputPassword || e == TouchIDUtils.TouchIDState.TouchIDLockout)
- {
- ///灏嗛獙璇侀潰瀹笽D鐨勯〉闈㈢Щ闄�
- MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
-
- GotogoToVerifyPasswordPage(optionType, refreshAction);
- }
- };
- }
-
- /// <summary>
- /// FaceID楠岃瘉 鍏抽棴瑙ｉ攣璁剧疆
- /// </summary>
- /// <param name="action">楠岃瘉鎴愬姛浜嬩欢</param>
- void FaceIDVerification_TurnOffUnlock(Action successAction)
- {
- //浣跨敤瀵嗙爜楠岃瘉
- Action goToVerifyPasswordAction = () =>
- {
- //鍏抽棴瑙ｉ攣楠岃瘉
- GotogoToVerifyPasswordPage("4", successAction);
- };
-
- TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.VerifyFaceID));
+ TouchIDUtils.Instance.showTouchIDWithDescribe(verificationTitleString, Language.StringByID(StringId.VerifyFaceID));
TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = (sender1, e) =>
{
if (e == TouchIDUtils.TouchIDState.Success)
@@ -412,75 +352,76 @@
}
/// <summary>
- /// 鎸囩汗ID寮�鍚拰鍏抽棴
+ /// 闈㈠ID寮�鍚拰鍏抽棴
/// </summary>
- void TouchIDVerification_SwtichOnOff()
+ /// <param name="successAction">楠岃瘉鎴愬姛浜嬩欢</param>
+ void FaceIDVerification_SwtichOnOff()
{
- //5:鎸囩汗ID寮�鍏�
- string optionType = "5";
+ //4:闈㈠ID
+ string faceIDUnlockType = "4";
+ //6:闈㈠ID寮�鍏�
+ string optionType = "6";
//鎴愬姛浜嬩欢
Action successAction = () =>
{
- var result = btnFingerprintUnlockSwtichIcon.IsSelected = !btnFingerprintUnlockSwtichIcon.IsSelected;
+ var result = btnFaceIdUnlockSwtichIcon.IsSelected = !btnFaceIdUnlockSwtichIcon.IsSelected;
if (result)
{
- if (!UserInfo.Current.appUnlockType.Contains("3"))
+ if (!UserInfo.Current.appUnlockType.Contains(faceIDUnlockType))
{
- UserInfo.Current.appUnlockType.Add("3");
+ UserInfo.Current.appUnlockType.Add(faceIDUnlockType);
UserInfo.Current.SaveUserInfo();
}
}
else
{
- if (UserInfo.Current.appUnlockType.Contains("3"))
+ if (UserInfo.Current.appUnlockType.Contains(faceIDUnlockType))
{
- UserInfo.Current.appUnlockType.Remove("3");
+ UserInfo.Current.appUnlockType.Remove(faceIDUnlockType);
UserInfo.Current.SaveUserInfo();
}
}
};
-
-
- Action fingerAction = () =>
+
+ //璺宠浆鏁板瓧瀵嗙爜鎴栬�呮墜鍔垮瘑鐮侀獙璇侀〉闈�
+ Action goToVerifyPasswordAction = () =>
{
- TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
+ //鍏抽棴瑙ｉ攣楠岃瘉
+ GotogoToVerifyPasswordPage(optionType, successAction);
};
- new AppUnlockPage().LoadGesturePage(optionType, fingerAction, successAction);
- TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
+ FaceIDVerification_Show(successAction, goToVerifyPasswordAction);
- TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = (sender1, e) =>
- {
- if (e == TouchIDUtils.TouchIDState.Success)
- {
- successAction?.Invoke();
-
- MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
- }
- else// if (e == TouchIDUtils.TouchIDState.InputPassword || e == TouchIDUtils.TouchIDState.TouchIDLockout)
- {
- ///灏嗛獙璇佹寚绾笽D鐨勯〉闈㈢Щ闄�
- MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
-
- GotogoToVerifyPasswordPage(optionType, refreshAction);
- }
- };
}
/// <summary>
- /// TouchID楠岃瘉 鍏抽棴瑙ｉ攣璁剧疆
+ /// FaceID楠岃瘉 鍏抽棴瑙ｉ攣璁剧疆
/// </summary>
/// <param name="action">楠岃瘉鎴愬姛浜嬩欢</param>
- void TouchIDVerification_TurnOffUnlock(Action successAction)
+ void FaceIDVerification_TurnOffUnlock(Action successAction)
{
- //浣跨敤瀵嗙爜楠岃瘉
+ //璋冩暣鏁板瓧瀵嗙爜鎴栬�呮墜鍔垮瘑鐮侀獙璇侀〉闈�
Action goToVerifyPasswordAction = () =>
{
//鍏抽棴瑙ｉ攣楠岃瘉
GotogoToVerifyPasswordPage("4", successAction);
};
- TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
+ FaceIDVerification_Show(successAction, goToVerifyPasswordAction);
+ }
+
+ /// <summary>
+ /// 鎸囩汗ID缁熶竴寮瑰嚭
+ /// </summary>
+ /// <param name="optionType"></param>
+ /// <param name="successAction"></param>
+ /// <param name="goToVerifyPasswordAction"></param>
+ void TouchIDVerification_Show(Action successAction, Action goToVerifyPasswordAction)
+ {
+ //鎻愮ず鏁板瓧瀵嗙爜楠岃瘉杩樻槸缁樺埗鎵嬪娍楠岃瘉
+ string verificationTitleString = GetVerificationTitleString();
+
+ TouchIDUtils.Instance.showTouchIDWithDescribe(verificationTitleString, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = (sender1, e) =>
{
if (e == TouchIDUtils.TouchIDState.NotSupport)
@@ -503,6 +444,63 @@
}
/// <summary>
+ /// 鎸囩汗ID寮�鍚拰鍏抽棴 5:鎸囩汗ID寮�鍏�
+ /// </summary>
+ void TouchIDVerification_SwtichOnOff()
+ {
+ //鎸囩汗鍏抽棴鎴愬姛浜嬩欢 鎴愬姛浜嬩欢
+ 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();
+ }
+ }
+ };
+
+ //5:鎸囩汗ID寮�鍏�
+ string optionType = "5";
+ //璺宠浆鏁板瓧瀵嗙爜鎴栬�呮墜鍔垮瘑鐮侀獙璇侀〉闈�
+ Action goToVerifyPasswordAction = () =>
+ {
+ //5:鎸囩汗ID寮�鍏�
+ GotogoToVerifyPasswordPage(optionType, successAction);
+ };
+
+
+
+ TouchIDVerification_Show(successAction, goToVerifyPasswordAction);
+ }
+
+ /// <summary>
+ /// TouchID楠岃瘉 4:鍏抽棴瑙ｉ攣璁剧疆
+ /// </summary>
+ /// <param name="action">楠岃瘉鎴愬姛浜嬩欢</param>
+ void TouchIDVerification_TurnOffUnlock(Action successAction)
+ {
+ //璺宠浆鏁板瓧瀵嗙爜鎴栬�呮墜鍔垮瘑鐮侀獙璇侀〉闈�
+ Action goToVerifyPasswordAction = () =>
+ {
+ //4.鍏抽棴瑙ｉ攣楠岃瘉
+ GotogoToVerifyPasswordPage("4", successAction);
+ };
+
+ TouchIDVerification_Show(successAction, goToVerifyPasswordAction);
+ }
+
+ /// <summary>
/// 璺宠浆鎵嬪娍鎴栬�呭瘑鐮侀獙璇佺晫闈�
/// </summary>
/// <param name="optionType">1:璁剧疆瀵嗙爜锛�2:楠岃瘉瀵嗙爜;3:鍏抽棴瀵嗙爜;4:鍏抽棴瑙ｉ攣璁剧疆;5:鎸囩汗ID寮�鍏筹紱6:闈㈠ID寮�鍏�;7:瑙ｉ攣楠岃瘉</param>
@@ -524,5 +522,30 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
}
+
+ /// <summary>
+ /// 鍒ゆ柇鏄惁鏁板瓧楠岃瘉銆佸惁鍒欑粯鍒舵墜鍔块獙璇�
+ /// </summary>
+ /// <returns></returns>
+ bool CheckIfUnlockPassword()
+ {
+ return UserInfo.Current.appUnlockType.Contains("1");
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇鏄惁鏁板瓧楠岃瘉銆佸惁鍒欑粯鍒舵墜鍔块獙璇�
+ /// </summary>
+ /// <returns></returns>
+ string GetVerificationTitleString()
+ {
+ if (CheckIfUnlockPassword())
+ {
+ return Language.StringByID(StringId.PasswordVerification);
+ }
+ else
+ {
+ return Language.StringByID(StringId.GestureVerification);
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0