2020-12-12 1.解锁逻辑优化

JLChen

2020-12-12 b3abfd30576871c32f2839a322fa3bb783f96498

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

@@ -135,197 +135,68 @@
                        //密码验证失败
                        PasswordInputError(optionType);
                    }
                    //if (optionType == "2")
                    //{
                    //    //移除当前界面，每次返回都返回到最上级
                    //    this.RemoveFromParent();
                    //    var page = new AppUnlockGesturePage("", backAction);
                    //    MainPage.BasePageView.AddChidren(page);
                    //    page.LoadPage("1");
                    //    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    //    return;
                    //}
                    //if(optionType == "7")
                    //{
                    //    if (passwrod == oldPasswrod)
                    //    {
                    //        this.RemoveFromParent();
                    //        backAction();
                    //    }
                    //    else
                    //    {
                    //        btnTipMsg.TextID = StringId.AuthenticationFailedGestureError;
                    //        btnTipMsg.IsSelected = true;
                    //        btnTipMsg.Visible = true;
                    //    }
                    //    return;
                    //}
                    //if (optionType == "3" || optionType == "4")
                    //{
                    //    if (passwrod == oldPasswrod)
                    //    {
                    //        if (optionType == "4")
                    //        {
                    //            backAction();
                    //            this.RemoveFromParent();
                    //            return;
                    //        }
                    //        if (UserInfo.Current.appUnlockType.Contains("2"))
                    //        {
                    //            UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>();
                    //            UserInfo.Current.appUnlockPasswrod = "";
                    //            UserInfo.Current.SaveUserInfo();
                    //            this.RemoveFromParent();
                    //            backAction();
                    //        }
                    //    }
                    //    else
                    //    {
                    //        btnTipMsg.TextID = StringId.AuthenticationFailedGestureError;
                    //        btnTipMsg.IsSelected = true;
                    //        btnTipMsg.Visible = true;
                    //    }
                    //    return;
                    //}
                    //if (optionType == "5" || optionType == "6"|| optionType == "8" || optionType == "9")
                    //{
                    //    if (passwrod == oldPasswrod)
                    //    {
                    //        if (optionType == "5" )//&& UserInfo.Current.appUnlockType.Contains("3"))
                    //        {
                    //            if (UserInfo.Current.appUnlockType.Contains("3"))
                    //                UserInfo.Current.appUnlockType.Remove("3");
                    //            else
                    //                UserInfo.Current.appUnlockType.Add("3");

                    //            UserInfo.Current.SaveUserInfo();
                    //            this.RemoveFromParent();
                    //        }
                    //        if ( optionType == "6")
                    //        {
                    //            if (UserInfo.Current.appUnlockType.Contains("4"))
                    //                UserInfo.Current.appUnlockType.Remove("4");
                    //            else
                    //                UserInfo.Current.appUnlockType.Add("4");

                    //            UserInfo.Current.SaveUserInfo();
                    //            this.RemoveFromParent();
                    //        }
                    //        if (optionType == "8" && !UserInfo.Current.appUnlockType.Contains("3"))
                    //        {
                    //            UserInfo.Current.appUnlockType.Add("3");
                    //            UserInfo.Current.SaveUserInfo();
                    //            this.RemoveFromParent();
                    //        }
                    //        if (!UserInfo.Current.appUnlockType.Contains("4") && optionType == "9")
                    //        {
                    //            UserInfo.Current.appUnlockType.Remove("4");
                    //            UserInfo.Current.SaveUserInfo();
                    //            this.RemoveFromParent();
                    //        }
                    //        backAction();
                    //    }
                    //    else
                    //    {
                    //        btnTipMsg.TextID = StringId.AuthenticationFailedGestureError;
                    //        btnTipMsg.IsSelected = true;
                    //        btnTipMsg.Visible = true;
                    //    }
                    //    return;
                    //}
                    //if (passwrod == oldPasswrod)
                    //{
                    //    this.RemoveFromParent();
                    //    var page = new OperationResultDisPalyPage();
                    //    page.Show();
                    //    page.LoadPage(true, Language.StringByID(StringId.SetSuccessfully), Language.StringByID(StringId.SetSuccessfully), "");
                    //    //page.LoadPage(true, Language.StringByID(StringId.SetSuccessfully), Language.StringByID(StringId.SetSuccessfully), "");
                    //    string tipMsg = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? Language.StringByID(StringId.TurnOnFingerprintUnlocking) :
                    //                    Language.StringByID(StringId.TurnOnFaceIdUnlocking);
                    //    if (TouchIDUtils.getTouchIDSupperType() != TouchIDUtils.TouchIDSupperType.None)
                    //    {
                    //        Action<bool> action = (result) =>
                    //        {
                    //            var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
                    //            if (result)
                    //            {
                    //                if (!UserInfo.Current.appUnlockType.Contains(unlockType))
                    //                {
                    //                    UserInfo.Current.appUnlockType.Add(unlockType);
                    //                }
                    //            }
                    //            else
                    //            {
                    //                if (UserInfo.Current.appUnlockType.Contains(unlockType))
                    //                {
                    //                    UserInfo.Current.appUnlockType.Remove(unlockType);
                    //                }
                    //            }
                    //            UserInfo.Current.SaveUserInfo();
                    //            backAction();
                    //        };
                    //        page.AdditionalOperations(tipMsg, action);
                    //    }
                    //    if (!UserInfo.Current.appUnlockType.Contains("2"))
                    //    {
                    //        UserInfo.Current.appUnlockType.Add("2");
                    //    }
                    //    UserInfo.Current.appUnlockPasswrod = passwrod;
                    //    UserInfo.Current.SaveUserInfo();
                    //    backAction();
                    //}
                    //else
                    //{
                    //    btnTipMsg.Text = Language.StringByID(StringId.DrawingInconsistencyError);
                    //    btnTipMsg.IsSelected = true;
                    //}
                    
                }

            };

            if (optionType == "5" || optionType == "6" || optionType == "7")

            //加载底部验证按钮
            if (optionType == "5" || optionType == "6")
            {
                Button btnLoginAccountVerify = new Button()
                {
                    Y = Application.GetRealHeight(517),
                    Height = Application.GetRealHeight(60),
                    TextAlignment = TextAlignment.Center,
                    TextSize = CSS_FontSize.TextFontSize,
                    TextColor = CSS_Color.MainColor,
                    TextID = StringId.EnterLoginPasswordVerification,
                };
                bodyView.AddChidren(btnLoginAccountVerify);

                btnLoginAccountVerify.MouseUpEventHandler = (sender, e) =>
                {
                    if (optionType == "7")
                    {
                        MainPage.GoLoginPage(UserInfo.Current);
                    }
                    else
                    {
                        Action<string> action = (pw) =>
                        {
                            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();
                            }
                            else
                            {
                                //登录失败
                                IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
                            }

                        };
                        new PublicAssmebly().LoadDialog_EditParater(StringId.EnterLoginPasswordVerification, "", action, StringId.PlsEntryPassword, 0, new System.Collections.Generic.List<string>(), true);
                    }
                };
                //输入登录密码验证 提示按钮
                AddInputPasswordTipButton();
            }
            else if (optionType == "7")
            {
                //使用账户密码登录按钮 提示按钮
                AddLoginTipButton();
            }


            //if (optionType == "5" || optionType == "6" || optionType == "7")
            //{
            //    Button btnLoginAccountVerify = new Button()
            //    {
            //        Y = Application.GetRealHeight(517),
            //        Height = Application.GetRealHeight(60),
            //        TextAlignment = TextAlignment.Center,
            //        TextSize = CSS_FontSize.TextFontSize,
            //        TextColor = CSS_Color.MainColor,
            //        TextID = StringId.EnterLoginPasswordVerification,
            //    };
            //    bodyView.AddChidren(btnLoginAccountVerify);

            //    btnLoginAccountVerify.MouseUpEventHandler = (sender, e) =>
            //    {
            //        if (optionType == "7")
            //        {
            //            MainPage.GoLoginPage(UserInfo.Current);
            //        }
            //        else
            //        {
            //            Action<string> action = (pw) =>
            //            {
            //                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();
            //                }
            //                else
            //                {
            //                    //登录失败
            //                    IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
            //                }

            //            };
            //            new PublicAssmebly().LoadDialog_EditParater(StringId.EnterLoginPasswordVerification, "", action, StringId.PlsEntryPassword, 0, new System.Collections.Generic.List<string>(), true);
            //        }
            //    };
            //}
        }

        /// <summary>
@@ -461,5 +332,70 @@
                backAction();
            }
        }


        /// <summary>
        /// 使用账户密码登录按钮 提示按钮
        /// </summary>
        void AddLoginTipButton()
        {
            Button btnLoginAccountVerify = new Button()
            {
                Y = Application.GetRealHeight(517),
                Height = Application.GetRealHeight(60),
                TextAlignment = TextAlignment.Center,
                TextSize = CSS_FontSize.TextFontSize,
                TextColor = CSS_Color.MainColor,
                TextID = StringId.LogWithAccountAndPassword,
            };
            bodyView.AddChidren(btnLoginAccountVerify);

            btnLoginAccountVerify.MouseUpEventHandler = (sender, e) =>
            {
                //退出登录
                HDLCommon.Current.Logout();
            };
        }

        /// <summary>
        /// 输入登录密码验证 提示按钮
        /// </summary>
        void AddInputPasswordTipButton()
        {
            Button btnLoginAccountVerify = new Button()
            {
                Y = Application.GetRealHeight(517),
                Height = Application.GetRealHeight(60),
                TextAlignment = TextAlignment.Center,
                TextSize = CSS_FontSize.TextFontSize,
                TextColor = CSS_Color.MainColor,
                TextID = StringId.EnterLoginPasswordVerification,
            };
            bodyView.AddChidren(btnLoginAccountVerify);

            btnLoginAccountVerify.MouseUpEventHandler = (sender, e) =>
            {
                //输入登录密码验证
                Action<string> action = (pw) =>
                {
                    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();
                    }
                    else
                    {
                        //登录失败
                        IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
                    }

                };
                new PublicAssmebly().LoadDialog_EditParater(StringId.EnterLoginPasswordVerification, "", action, StringId.PlsEntryPassword, 0, new System.Collections.Generic.List<string>(), true);
            };
        }
    }
}