合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs

@@ -256,13 +256,13 @@
                        //密码验证

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

                        {

                            var form = new SecondaryPswSecurityForm();

                            var form = new PswSecondarySecurityForm();

                            form.AddForm(i_TouchText, i_PasswordText, i_GestureText, SuccessAction);

                        }

                        //手势验证

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

                        {

                            var form = new GesturePswSecirityForm();

                            var form = new PswGestureSecirityForm();

                            form.AddForm(i_TouchText, i_PasswordText, i_GestureText, SuccessAction);

                        }

                        else

@@ -279,14 +279,14 @@
            else if (string.IsNullOrEmpty(UserCenterResourse.Option.PswAuthentication) == false)

            {

                //密码验证

                var form = new SecondaryPswSecurityForm();

                var form = new PswSecondarySecurityForm();

                form.AddForm(i_TouchText, i_PasswordText, i_GestureText, SuccessAction);

                FailAction = null;

            }

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

            {

                //手势验证

                var form = new GesturePswSecirityForm();

                var form = new PswGestureSecirityForm();

                form.AddForm(i_TouchText, i_PasswordText, i_GestureText, SuccessAction);

                FailAction = null;

            }