Merge branch 'CJL' into NewFilePath

wxr

2020-12-15 dbf79099f47d5f06223edfd5b8dc06c51b1830aa

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

@@ -58,12 +58,15 @@
            };
            bodyView.AddChidren(btnTipTitle);


            if (optionType == "2" || optionType == "3")
            if (optionType == "1")
            {
                btnTipTitle.TextID = string.IsNullOrEmpty(oldPasswrod) ? StringId.PlsEntryPassword : StringId.PlsRegisterRepeatPassword;
            }
            else if (optionType == "2")
            {
                btnTipTitle.TextID = StringId.PleaseEnterTheOriginalDigitalPassword;
            }
            if (optionType == "7")
            else
            {
                btnTipTitle.TextID = StringId.PlsEntryPassword;
            }
@@ -152,7 +155,8 @@

            //etPassword.MouseUpEventHandler = (sender, e) => { };

            etPassword.TextChangeEventHandler = (sender, e) => {
            etPassword.TextChangeEventHandler = (sender, e) =>
            {
                passwrod = etPassword.Text.Trim();
                switch (etPassword.Text.Trim().Length)
                {
@@ -214,7 +218,8 @@
                }
            };

            EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                etPassword.Foucs = true;
            };
            bodyView.MouseUpEventHandler = eventHandler;
@@ -229,9 +234,9 @@
            if (optionType == "3" || optionType == "5" || optionType == "6")
            {
                //输入登录密码验证 提示按钮
                AddInputPasswordTipButton();
                AddInputPasswordTipButton(optionType);
            }
            else if(optionType == "7")
            else if (optionType == "7")
            {
                //使用账户密码登录按钮 提示按钮
                AddLoginTipButton();
@@ -285,26 +290,33 @@
                if (TouchIDUtils.getTouchIDSupperType() != TouchIDUtils.TouchIDSupperType.None)
                {
                    var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
                    Action<bool> action = (result) =>

                    //如果之前没设置指纹或者面容ID才显示是否开启
                    if (!UserInfo.Current.appUnlockType.Contains(unlockType))
                    {
                        if (result)
                        Action<bool> action = (result) =>
                        {
                            if (!UserInfo.Current.appUnlockType.Contains(unlockType))
                            if (result)
                            {
                                UserInfo.Current.appUnlockType.Add(unlockType);
                                if (!UserInfo.Current.appUnlockType.Contains(unlockType))
                                {
                                    UserInfo.Current.appUnlockType.Add(unlockType);
                                }
                            }
                        }
                        else
                        {
                            if (UserInfo.Current.appUnlockType.Contains(unlockType))
                            else
                            {
                                UserInfo.Current.appUnlockType.Remove(unlockType);
                                if (UserInfo.Current.appUnlockType.Contains(unlockType))
                                {
                                    UserInfo.Current.appUnlockType.Remove(unlockType);
                                }
                            }
                        }
                        backAction();
                        UserInfo.Current.SaveUserInfo();
                    };
                    page.AdditionalOperations(tipMsg, action);
                            backAction();
                            UserInfo.Current.SaveUserInfo();
                        };


                        page.AdditionalOperations(tipMsg, action);
                    }
                }
                if (!UserInfo.Current.appUnlockType.Contains("1"))
                {
@@ -384,7 +396,8 @@
        /// <summary>
        /// 使用账户密码登录按钮 提示按钮
        /// </summary>
        void AddLoginTipButton(){
        void AddLoginTipButton()
        {
            Button btnLoginAccountVerify = new Button()
            {
                Y = Application.GetRealHeight(517),
@@ -406,7 +419,7 @@
        /// <summary>
        /// 输入登录密码验证 提示按钮
        /// </summary>
        void AddInputPasswordTipButton()
        void AddInputPasswordTipButton(string optionType)
        {
            Button btnLoginAccountVerify = new Button()
            {
@@ -422,15 +435,18 @@
            btnLoginAccountVerify.MouseUpEventHandler = (sender, e) =>
            {
                //输入登录密码验证
                Action<string> action = (pw) => {
                Action<string> action = (pw) =>
                {
                    var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw);
                    if (resultObj.Code.ToUpper() == 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
                    {
@@ -438,8 +454,7 @@
                        {
                            Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError));
                        });
                        ////登录失败
                        //IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);

                    }

                };