新云端代码Ver1.2

黄学彪

2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134

 ZigbeeApp/Shared/Phone/Common/Form/PswSecondarySecurityForm.cs

File was renamed from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;

namespace Shared.Phone.UserCenter
namespace Shared.Phone
{
    /// <summary>
    /// 二次密码验证界面
@@ -62,15 +62,15 @@
            };
            pswControl.FinishInputEvent += (strPsw) =>
            {
                if (UserCenterResourse.AccountOption.PswAuthentication != strPsw)
                if (HdlUserCenterResourse.AccountOption.PswAuthentication != strPsw)
                {
                    UserCenterResourse.AccountOption.PasswordInputCount--;
                    if (UserCenterResourse.AccountOption.PasswordInputCount <= 0)
                    HdlUserCenterResourse.AccountOption.PasswordInputCount--;
                    if (HdlUserCenterResourse.AccountOption.PasswordInputCount <= 0)
                    {
                        //管理员身份验证失败,请重新登录
                        string msg2 = Language.StringByID(R.MyInternationalizationString.uCheckAdministratorFailAndReload);
                        this.ShowMassage(ShowMsgType.Tip, msg2);
                        UserCenterLogic.ReLoginAgain(Common.Config.Instance.Account);
                        HdlAccountLogic.Current.ReLoginAgain(Common.Config.Instance.Account);
                        return;
                    }
                    //密码错误，请重新输入
@@ -78,7 +78,7 @@
                    return;
                }
                //重置剩余密码次数
                UserCenterResourse.AccountOption.ResetPasswordCount();
                HdlUserCenterResourse.AccountOption.ResetPasswordCount();
                //界面关闭
                this.CloseForm();
                SuccessAction?.Invoke();
@@ -89,7 +89,7 @@
            var btnGesture = new BottomLeftClickButton(frameBack.Width / 2, Application.GetRealHeight(127));
            frameBack.AddChidren(btnGesture);
            btnGesture.InitControl(i_GestureText);
            if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.GestureAuthentication) == true)
            if (string.IsNullOrEmpty(HdlUserCenterResourse.AccountOption.GestureAuthentication) == true)
            {
                //没有启用手势开锁
                btnGesture.CanClick = false;
@@ -98,14 +98,14 @@
            btnGesture.ButtonClickEvent += (sender, e) =>
            {
                var form = new PswGestureSecirityForm();
                this.AddFromAndRemoveNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
                this.AddFormAndCloseNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
            };

            //Touch ID开锁
            var btnTouch = new BottomRightClickButton(frameBack.Width - btnGesture.Width, btnGesture.Height);
            frameBack.AddChidren(btnTouch);
            btnTouch.InitControl(i_TouchText);
            if (UserCenterResourse.AccountOption.FingerprintAuthentication == false)
            if (HdlUserCenterResourse.AccountOption.FingerprintAuthentication == false)
            {
                //没有启用Touch ID
                btnTouch.CanClick = false;
@@ -138,16 +138,16 @@
                        TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = null;

                        //密码验证
                        if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.PswAuthentication) == false)
                        if (string.IsNullOrEmpty(HdlUserCenterResourse.AccountOption.PswAuthentication) == false)
                        {
                            var form = new PswSecondarySecurityForm();
                            this.AddFromAndRemoveNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
                            this.AddFormAndCloseNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
                        }
                        //手势验证
                        else if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.GestureAuthentication) == false)
                        else if (string.IsNullOrEmpty(HdlUserCenterResourse.AccountOption.GestureAuthentication) == false)
                        {
                            var form = new PswGestureSecirityForm();
                            this.AddFromAndRemoveNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
                            this.AddFormAndCloseNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
                        }
                        else
                        {