Merge branch 'CJL' into NewFilePath

wxr

2020-12-15 dbf79099f47d5f06223edfd5b8dc06c51b1830aa

 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs

@@ -66,7 +66,7 @@
                IsBold = true,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
                TextID = optionType == "7" ? StringId.SetGesturePassword : StringId.VerifyGesturePassword,
                TextID =  StringId.VerifyGesturePassword,
            };
            bodyView.AddChidren(btnTipTitle);

@@ -79,14 +79,27 @@
                TextColor = CSS_Color.TextualColor,
                SelectedTextColor = CSS_Color.WarningColor,
                TextSize = CSS_FontSize.TextFontSize,
                TextID = optionType == "2" ? StringId.DrawUnlockPatternAgain : StringId.DrawUnlockPattern,
                TextID = StringId.DrawUnlockPattern,
            };
            bodyView.AddChidren(btnTipMsg);

            if (optionType == "7")
            if (optionType == "1")
            {
                btnTipTitle.TextID = StringId.DrawUnlockPattern;
                btnTipMsg.TextID = string.IsNullOrEmpty(oldPasswrod) ? StringId.DrawUnlockPattern : StringId.DrawUnlockPatternAgain;
                //设置手势密码
                btnTipTitle.TextID = StringId.SetGesturePassword;
            }else if(optionType == "2")
            {
                //请输入原手势密码
                btnTipTitle.TextID = StringId.PleaseDrawTheOriginalGesturePassword;
            }

            //if (optionType == "7")
            //{
            //    //请绘制解锁图案
            //    btnTipTitle.TextID = StringId.DrawUnlockPattern;
            //}


            GestureLockView mGestureLockView = new GestureLockView
            {
@@ -145,7 +158,7 @@
            if (optionType == "5" || optionType == "6")
            {
                //输入登录密码验证 提示按钮
                AddInputPasswordTipButton();
                AddInputPasswordTipButton(optionType);
            }
            else if (optionType == "7")
            {
@@ -242,9 +255,13 @@
                                Language.StringByID(StringId.TurnOnFaceIdUnlocking);
                if (TouchIDUtils.getTouchIDSupperType() != TouchIDUtils.TouchIDSupperType.None)
                {
                    Action<bool> action = (result) =>
                    var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";

                    //如果之前没设置指纹或者面容ID才显示是否开启
                    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 +279,8 @@
                        UserInfo.Current.SaveUserInfo();
                        backAction();
                    };
                    page.AdditionalOperations(tipMsg, action);
                        page.AdditionalOperations(tipMsg, action);
                    }
                }
                if (!UserInfo.Current.appUnlockType.Contains("2"))
                {
@@ -360,7 +378,7 @@
        /// <summary>
        /// 输入登录密码验证 提示按钮
        /// </summary>
        void AddInputPasswordTipButton()
        void AddInputPasswordTipButton(string optionType)
        {
            Button btnLoginAccountVerify = new Button()
            {
@@ -381,16 +399,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));
                        });
                    }

                };