2020-07-10-01

陈嘉乐

2020-07-10 48ba446936b51fffafa7c3600c0dadc6ac0e8c20

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswGestureSecirityForm.cs

@@ -43,7 +43,7 @@
            frameBack.Width = Application.GetRealWidth(965);

            frameBack.Height = Application.GetRealHeight(1486);

            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Radius = 8;

            frameBack.Radius = (uint)Application.GetRealHeight(17);

            bodyFrameLayout.AddChidren(frameBack);



            //手势验证控件

@@ -59,10 +59,10 @@
            };

            gestureControl.FinishInputEvent += (Password, pswLeng) =>

            {

                if (UserCenterResourse.Option.GestureAuthentication != Password)

                if (UserCenterResourse.AccountOption.GestureAuthentication != Password)

                {

                    UserCenterResourse.Option.PasswordGestureInputCount--;

                    if (UserCenterResourse.Option.PasswordGestureInputCount <= 0)

                    UserCenterResourse.AccountOption.PasswordGestureInputCount--;

                    if (UserCenterResourse.AccountOption.PasswordGestureInputCount <= 0)

                    {

                        //管理员身份验证失败,请重新登录

                        string msg2 = Language.StringByID(R.MyInternationalizationString.uCheckAdministratorFailAndReload);

@@ -75,7 +75,7 @@
                    return;

                }

                //重置剩余密码次数

                UserCenterResourse.Option.ResetPasswordCount();

                UserCenterResourse.AccountOption.ResetPasswordCount();

                //界面关闭

                this.CloseForm();

                SuccessAction?.Invoke();

@@ -86,7 +86,7 @@
            var btnTouch = new BottomLeftClickButton(frameBack.Width / 2, Application.GetRealHeight(127));

            frameBack.AddChidren(btnTouch);

            btnTouch.InitControl(i_TouchText);

            if (UserCenterResourse.Option.FingerprintAuthentication == false)

            if (UserCenterResourse.AccountOption.FingerprintAuthentication == false)

            {

                //没有启用Touch ID

                btnTouch.CanClick = false;

@@ -117,13 +117,13 @@
                        TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = null;



                        //密码验证

                        if (string.IsNullOrEmpty(UserCenterResourse.Option.PswAuthentication) == false)

                        if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.PswAuthentication) == false)

                        {

                            var form = new PswSecondarySecurityForm();

                            this.AddFromAndRemoveNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);

                        }

                        //手势验证

                        else if (string.IsNullOrEmpty(UserCenterResourse.Option.GestureAuthentication) == false)

                        else if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.GestureAuthentication) == false)

                        {

                            var form = new PswGestureSecirityForm();

                            this.AddFromAndRemoveNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);

@@ -142,7 +142,7 @@
            var btnPsw = new BottomRightClickButton(frameBack.Width - btnTouch.Width, btnTouch.Height);

            frameBack.AddChidren(btnPsw);

            btnPsw.InitControl(i_PasswordText);

            if (string.IsNullOrEmpty(UserCenterResourse.Option.PswAuthentication) == true)

            if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.PswAuthentication) == true)

            {

                //没有启用密码开锁

                btnPsw.CanClick = false;