feat： 密码校验提交

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/ReplaceEtcStep4Activity.java

@@ -238,7 +238,7 @@ public class ReplaceEtcStep4Activity extends AppActivity {
                 hideDialog();
 
                 //TODO 测试 绕过短信验证码校验
-                /*if (cancel){//取消申请
+                if (cancel){//取消申请
                     cancelApply();
                     return;
                 }
@@ -247,7 +247,7 @@ public class ReplaceEtcStep4Activity extends AppActivity {
                     gotoNextPage(applyData.getId());
                 }else{//申请
                     applyExchange();
-                }*/
+                }
 
             }
         });

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/ReplaceEtcStep5Activity.java

@@ -15,6 +15,7 @@ import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
 import com.huntersun.vkyes.etcopencard.project.dialog.ConfirmDialog;
 import com.huntersun.vkyes.etcopencard.project.dialog.MenuMailDialog;
 import com.huntersun.vkyes.etcopencard.project.dialog.ReasonListDialog;
+import com.huntersun.vkyes.etcopencard.project.tool.MyShared;
 import com.huntersun.vkyes.etcopencard.project.ui.activity.order.EditOrderAddrActivity;
 import com.huntersun.vkyes.etcopencard.project.utils.Constants;
 import com.huntersun.vkyes.etcopencard.project.utils.FunHelper;
@@ -157,6 +158,13 @@ public class ReplaceEtcStep5Activity extends AppActivity {
         params.put("region", FunHelper.getText(binding.tvArea));
         params.put("postalCode", FunHelper.getText(binding.etPostCard));
         params.put("applyRes", FunHelper.isEmpty(FunHelper.getText(binding.etReason)) ? FunHelper.getText(binding.tvReason) : FunHelper.getText(binding.etReason));
+
+        params.put("agentId", "52010106004");
+        params.put("channelId", "5201010200601130001");
+        params.put("channelType", "1");
+        params.put("terminalId", "999999999999");
+        params.put("TerminalId", "999999999999");
+        params.put("staffId", (String) MyShared.getInstance().get(MyShared.OPENID, ""));
         MyRetrofit.newInstance(IFCode.IFCODE887, params, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {

app/src/main/java/com/huntersun/vkyes/etcopencard/src/ui/activity/LoginActivity.java

@@ -238,6 +238,13 @@ public final class LoginActivity extends AppActivity implements KeyboardWatcher.
                 return;
             }
 
+            if (loginStart && !ValidatorUtils.isRightPassword(FunHelper.getText(mPasswordView))){
+                toast("密码格式输入错误");
+                mPasswordView.startAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.shake_anim));
+                mCommitView.showError(3000);
+                return;
+            }
+
             if (loginStart) {//账号密码登录
                 loginByPwd();
             } else {//验证码登录

library/obublelib/src/main/java/com/huntersun/vky/obublelib/util/ValidatorUtils.java

@@ -38,7 +38,7 @@ public class ValidatorUtils {
     /*
      * 正则表达式：校验密码
      */
-    private static final String REGEX_PASSWORD = "^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[`~!@#$%^&*()_\\-+=<>?:\"{}|,.\\/;'\\\\[\\]·~！@#￥%……&*（）——\\-+={}|《》？：“”【】、；‘'，。、])[0-9a-zA-Z!`~!@#$%^&*()_\\-+=<>?:\"{}|,.\\/;'\\\\[\\]·~！@#￥%……&*（）——\\-+={}|《》？：“”【】、；‘'，。、]{10,20}$";
+    private static final String REGEX_PASSWORD = "^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[`~!@#$%^&*()_\\-+=<>?:\\\"{}|,.\\\\/;'\\\\\\\\[\\\\]·~！@#￥%……&*（）——\\-+={}|《》？：“”【】、；‘'，。、])[0-9a-zA-Z!`~!@#$%^&*()_\\-+=<>?:\\\"{}|,.\\\\/;'\\\\\\\\[\\\\]·~！@#￥%……&*（）——\\-+={}|《》？：“”【】、；‘'，。、]{10,20}$";
 
     /*
      * 禁止实例化.
@@ -64,8 +64,7 @@ public class ValidatorUtils {
      * @return
      */
     public static boolean isRightPassword(String pwd) {
-//        return Pattern.matches(REGEX_PASSWORD, pwd);
-        return true;
+        return Pattern.matches(REGEX_PASSWORD, pwd);
     }
 
     /*