合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

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

File was renamed from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/SecondaryPswSecurityForm.cs
@@ -7,7 +7,7 @@
    /// <summary>

    /// 二次密码验证界面

    /// </summary>

    public class SecondaryPswSecurityForm : DialogCommonForm

    public class PswSecondarySecurityForm : DialogCommonForm

    {

        #region ■ 变量声明___________________________



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

            frameBack.Height = Application.GetRealHeight(1711);

            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Radius = (uint)Application.GetMinRealAverage(6);

            frameBack.Radius = 6;

            bodyFrameLayout.AddChidren(frameBack);



            //密码输入控件

@@ -75,6 +75,7 @@
                    }

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

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

                    pswControl.ResetControlInfo(i_PasswordText, false);

                    return;

                }

                //重置剩余密码次数

@@ -101,7 +102,7 @@


            btnGesture.ButtonClickEvent += (sender, e) =>

            {

                var form = new GesturePswSecirityForm();

                var form = new PswGestureSecirityForm();

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

            };



@@ -148,13 +149,13 @@
                        //密码验证

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

                        {

                            var form = new SecondaryPswSecurityForm();

                            var form = new PswSecondarySecurityForm();

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

                        }

                        //手势验证

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

                        {

                            var form = new GesturePswSecirityForm();

                            var form = new PswGestureSecirityForm();

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

                        }

                        else