From 3861152ee23bfc0724579299b6be188f5f16b192 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:35:33 +0800
Subject: [PATCH] Merge branch 'tzy2' into newBranch1
---
HDL_ON/UI/UI0-Stan/Logic/HdlCheckLogic.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Logic/HdlCheckLogic.cs b/HDL_ON/UI/UI0-Stan/Logic/HdlCheckLogic.cs
index fcc986b..53f920a 100644
--- a/HDL_ON/UI/UI0-Stan/Logic/HdlCheckLogic.cs
+++ b/HDL_ON/UI/UI0-Stan/Logic/HdlCheckLogic.cs
@@ -46,7 +46,7 @@
/// <param name="addTopFrame">楠岃瘉鐣岄潰鏄惁娣诲姞澶撮儴Frame(鍙鎵嬪娍瀵嗙爜鍜屾暟瀛楀瘑鐮佹湁鏁�)</param>
/// <param name="successEvent">楠岃瘉鎴愬姛涔嬪悗鐨勫洖璋冨嚱鏁�,澶辫触涓嶄細鍥炶皟(0:娌℃湁璁剧疆鏈夐獙璇� 1:楠岃瘉鎴愬姛锛�</param>
/// <param name="loadPageBeforEvent">鍔犺浇鎸囧畾瑙ｉ攣璁よ瘉鐣岄潰涔嬪墠鐨勪簨浠�,0:鍙栨秷褰撳墠楠岃瘉骞跺垏鎹㈠埌鍏朵粬鏂瑰紡,1:鏁板瓧瀵嗙爜,2:鎵嬪娍瀵嗙爜,3:鎸囩汗瀵嗙爜,4:闈㈠ID</param>
- public void CheckUnlockSecurity(bool addTopFrame, Action<int> successEvent, Action<string> loadPageBeforEvent = null)
+ public void CheckUnlockSecurity(bool addTopFrame, Action<int> successEvent, Action<int> loadPageBeforEvent = null)
{
//楠岃瘉鎸囩汗鍜岄潰瀹筰d閮戒娇鐢ㄦ寚绾归獙璇�
if (UserInfo.Current.appUnlockType.Contains("3") || UserInfo.Current.appUnlockType.Contains("4"))
@@ -58,7 +58,7 @@
if (type == TouchIDUtils.TouchIDSupperType.TouchID)
{
//閫氱煡浣跨敤鎸囩汗楠岃瘉
- loadPageBeforEvent?.Invoke("3");
+ loadPageBeforEvent?.Invoke(3);
//Touch ID楠岃瘉
TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent += (sender2, e2) =>
@@ -77,7 +77,7 @@
else if (e2 == TouchIDUtils.TouchIDState.InputPassword)
{
//閫氱煡鍙栨秷浜嗛獙璇�,鍒囨崲涓哄叾浠栭獙璇�
- loadPageBeforEvent?.Invoke("0");
+ loadPageBeforEvent?.Invoke(0);
//浣跨敤瀵嗙爜鎴栬�呮墜鍔垮瘑鐮佽В閿佽璇�
this.CheckUnlockSecurityByPassword(addTopFrame, successEvent, loadPageBeforEvent);
@@ -108,12 +108,12 @@
/// <param name="addTopFrame">楠岃瘉鐣岄潰鏄惁娣诲姞澶撮儴Frame(鍙鎵嬪娍瀵嗙爜鍜屾暟瀛楀瘑鐮佹湁鏁�)</param>
/// <param name="successEvent">楠岃瘉鎴愬姛涔嬪悗鐨勫洖璋冨嚱鏁�,澶辫触涓嶄細鍥炶皟(0:娌℃湁璁剧疆鏈夐獙璇� 1:楠岃瘉鎴愬姛锛�</param>
/// <param name="loadPageBeforEvent">鍔犺浇鎸囧畾瑙ｉ攣璁よ瘉鐣岄潰涔嬪墠鐨勪簨浠�,1:鏁板瓧瀵嗙爜,2:鎵嬪娍瀵嗙爜,3:鎸囩汗瀵嗙爜,4:闈㈠ID</param>
- private void CheckUnlockSecurityByPassword(bool addTopFrame, Action<int> successEvent, Action<string> loadPageBeforEvent = null)
+ private void CheckUnlockSecurityByPassword(bool addTopFrame, Action<int> successEvent, Action<int> loadPageBeforEvent = null)
{
if (UserInfo.Current.appUnlockType.Contains("1"))
{
//閫氱煡浣跨敤鏁板瓧瀵嗙爜楠岃瘉
- loadPageBeforEvent?.Invoke("1");
+ loadPageBeforEvent?.Invoke(1);
//鏄剧ず鏁板瓧瀵嗙爜瑙ｉ攣璁よ瘉鐣岄潰
this.ShowAppNumPasswordSecurityForm(addTopFrame, successEvent);
@@ -121,7 +121,7 @@
else if (UserInfo.Current.appUnlockType.Contains("2"))
{
//閫氱煡浣跨敤鎵嬪娍瀵嗙爜楠岃瘉
- loadPageBeforEvent?.Invoke("2");
+ loadPageBeforEvent?.Invoke(2);
//鏄剧ず鎵嬪娍瀵嗙爜瑙ｉ攣璁よ瘉鐣岄潰
this.ShowAppGestureSecurityForm(addTopFrame, successEvent);
--
Gitblit v1.8.0