From 9c8baf7e7e1169ebdf7d5f7ed33ab29dd5fcbf18 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 14 十二月 2020 17:45:17 +0800
Subject: [PATCH] 2020-12-14 1.解锁设置问题修复,增加面容ID验证。2.错误码对接增加。

---
 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
index 6c33963..aa4ad3f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
@@ -145,7 +145,7 @@
             if (optionType == "5" || optionType == "6")
             {
                 //杈撳叆鐧诲綍瀵嗙爜楠岃瘉 鎻愮ず鎸夐挳
-                AddInputPasswordTipButton();
+                AddInputPasswordTipButton(optionType);
             }
             else if (optionType == "7")
             {
@@ -242,9 +242,13 @@
                                 Language.StringByID(StringId.TurnOnFaceIdUnlocking);
                 if (TouchIDUtils.getTouchIDSupperType() != TouchIDUtils.TouchIDSupperType.None)
                 {
-                    Action<bool> action = (result) =>
+                    var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
+
+                    //濡傛灉涔嬪墠娌¤缃寚绾规垨鑰呴潰瀹笽D鎵嶆樉绀烘槸鍚﹀紑鍚�
+                    if (!UserInfo.Current.appUnlockType.Contains(unlockType))
                     {
-                        var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
+                        Action<bool> action = (result) =>
+                    {
                         if (result)
                         {
                             if (!UserInfo.Current.appUnlockType.Contains(unlockType))
@@ -262,7 +266,8 @@
                         UserInfo.Current.SaveUserInfo();
                         backAction();
                     };
-                    page.AdditionalOperations(tipMsg, action);
+                        page.AdditionalOperations(tipMsg, action);
+                    }
                 }
                 if (!UserInfo.Current.appUnlockType.Contains("2"))
                 {
@@ -360,7 +365,7 @@
         /// <summary>
         /// 杈撳叆鐧诲綍瀵嗙爜楠岃瘉 鎻愮ず鎸夐挳
         /// </summary>
-        void AddInputPasswordTipButton()
+        void AddInputPasswordTipButton(string optionType)
         {
             Button btnLoginAccountVerify = new Button()
             {
@@ -381,16 +386,19 @@
                     var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw);
                     if (resultObj.Code == StateCode.SUCCESS)
                     {
-                        UserInfo.Current.appUnlockPasswrod = "";
-                        UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>();
-                        UserInfo.Current.SaveUserInfo();
-                        this.RemoveFromParent();
-                        backAction();
+                        //UserInfo.Current.appUnlockPasswrod = "";
+                        //UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>();
+                        //UserInfo.Current.SaveUserInfo();
+                        //this.RemoveFromParent();
+                        //backAction();
+                        PasswordInputPassed(optionType);
                     }
                     else
                     {
-                        //鐧诲綍澶辫触
-                        IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
+                        Application.RunOnMainThread(() =>
+                        {
+                            Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError));
+                        });
                     }
 
                 };

--
Gitblit v1.8.0