2020-03-12-1

WJC

2020-03-12 c47c3ec2488961b3a006aaebcb03dba582f8b19b

 ZigbeeApp/Shared/Phone/UserCenter/Password/EditorSecondaryPasswordForm.cs

@@ -32,7 +32,7 @@
            //设置头部信息

            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uPasswordAuthentication));



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

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

            {

                formMode = FormMode.A验证前回密码;

            }

@@ -102,7 +102,7 @@
                    form.AddForm();

                };

                //底线

                int lineWidth = btnForgotPsw.GetRealWidthByText(12);

                int lineWidth = btnForgotPsw.GetRealWidthByText();

                var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);

                btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;

                btnLine.Gravity = Gravity.CenterHorizontal;

@@ -142,10 +142,10 @@
            }

            else if (formMode == FormMode.A验证前回密码)

            {

                if (UserCenterResourse.Option.PswAuthentication != i_Psw)

                if (UserCenterResourse.AccountOption.PswAuthentication != i_Psw)

                {

                    UserCenterResourse.Option.PasswordInputCount--;

                    if (UserCenterResourse.Option.PasswordInputCount <= 0)

                    UserCenterResourse.AccountOption.PasswordInputCount--;

                    if (UserCenterResourse.AccountOption.PasswordInputCount <= 0)

                    {

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

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

@@ -158,14 +158,14 @@
                    return;

                }

                //重置剩余密码次数

                UserCenterResourse.Option.ResetPasswordCount();

                UserCenterResourse.AccountOption.ResetPasswordCount();



                formMode = FormMode.A修改密码;

                this.InitMiddleFrame();

            }

            else if (formMode == FormMode.A修改密码)

            {

                if (i_Psw == UserCenterResourse.Option.PswAuthentication)

                if (i_Psw == UserCenterResourse.AccountOption.PswAuthentication)

                {

                    //新密码和原密码一致，请重新输入

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

@@ -221,7 +221,7 @@
                {

                    RequestVersion = Common.CommonPage.RequestVersion,

                    LoginAccessToken = Common.Config.Instance.Token,

                    GesturePwd = UserCenterResourse.Option.GestureAuthentication,

                    GesturePwd = UserCenterResourse.AccountOption.GestureAuthentication,

                    StringPwd = psw

                };

                var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpdatEexpandPwd", false, pra);

@@ -234,8 +234,8 @@
                }

                else

                {

                    UserCenterResourse.Option.PswAuthentication = psw;

                    UserCenterResourse.Option.Save();

                    UserCenterResourse.AccountOption.PswAuthentication = psw;

                    UserCenterResourse.AccountOption.Save();



                    HdlThreadLogic.Current.RunMain(() =>

                    {