Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -64,22 +64,11 @@
            {

                if (UserCenterResourse.Option.PswAuthentication != strPsw)

                {

                    UserCenterResourse.Option.PasswordInputCount--;

                    if (UserCenterResourse.Option.PasswordInputCount <= 0)

                    {

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

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

                        this.ShowMassage(ShowMsgType.Tip, msg2);

                        UserCenterLogic.ReLoginAgain(Common.Config.Instance.Account);

                        return;

                    }

                    //密码错误，请重新输入

                    pswControl.SetErrorMsg(Language.StringByID(R.MyInternationalizationString.uOldPsswordIsError));

                    pswControl.ResetControlInfo(i_PasswordText, false);

                    return;

                }

                //重置剩余密码次数

                UserCenterResourse.Option.ResetPasswordCount();

                //界面关闭

                this.CloseForm();

                SuccessAction?.Invoke();