删除了郭雪城的 DeviceUi 这个类

黄学彪

2020-03-06 a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15

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

@@ -62,10 +62,10 @@
            };

            pswControl.FinishInputEvent += (strPsw) =>

            {

                if (UserCenterResourse.Option.PswAuthentication != strPsw)

                if (UserCenterResourse.AccountOption.PswAuthentication != strPsw)

                {

                    UserCenterResourse.Option.PasswordInputCount--;

                    if (UserCenterResourse.Option.PasswordInputCount <= 0)

                    UserCenterResourse.AccountOption.PasswordInputCount--;

                    if (UserCenterResourse.AccountOption.PasswordInputCount <= 0)

                    {

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

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

@@ -78,7 +78,7 @@
                    return;

                }

                //重置剩余密码次数

                UserCenterResourse.Option.ResetPasswordCount();

                UserCenterResourse.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.Option.GestureAuthentication) == true)

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

            {

                //没有启用手势开锁

                btnGesture.CanClick = false;

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

            frameBack.AddChidren(btnTouch);

            btnTouch.InitControl(i_TouchText);

            if (UserCenterResourse.Option.FingerprintAuthentication == false)

            if (UserCenterResourse.AccountOption.FingerprintAuthentication == false)

            {

                //没有启用Touch ID

                btnTouch.CanClick = false;

@@ -138,13 +138,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);