Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im

plugin_wallet/src/main/java/com/xxrv/wallet/activity/SetPayPwdActivity.java

@@ -28,6 +28,7 @@ import com.rv.home.rv.module.ui.login.bean.SendCodeBean;
 import com.xxrv.wallet.R;
 import com.xxrv.wallet.R2;
 import com.xxrv.wallet.api.WalletApi;
+import com.xxrv.wallet.bean.SetPayPwdCodeBean;
 import com.xxrv.wallet.event.SetPasswordSuccessEvent;
 import com.yuyife.okgo.OkGoUtil;
 
@@ -72,7 +73,12 @@ public class SetPayPwdActivity extends BaseStatusActivity<CommonPresenter> {
                 showToast("验证码发送成功！");
                 break;
             case 2:
-                startActivity(SetPayPwdActivity2.getIntent(mActivity, getPhone(), getCode(), type));
+                SetPayPwdCodeBean result1 = (SetPayPwdCodeBean) result;
+                if (result1.isData()) {
+                    startActivity(SetPayPwdActivity2.getIntent(mActivity, getPhone(), getCode(), type));
+                } else {
+                    showToast("验证码不正确!");
+                }
                 break;
         }
     }
@@ -182,7 +188,7 @@ public class SetPayPwdActivity extends BaseStatusActivity<CommonPresenter> {
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("phone", getPhone());
         map.put("mobilecode", getCode());
-        mPresenter.getData(RvFrameConfig.HOST, 2, WalletApi.HTTP_URL_CHECK_CHECKCODE, BaseBean.class, map, headMap, true);
+        mPresenter.getData(RvFrameConfig.HOST, 2, WalletApi.HTTP_URL_CHECK_CHECKCODE, SetPayPwdCodeBean.class, map, headMap, true);
     }
 
     /**

plugin_wallet/src/main/java/com/xxrv/wallet/bean/SetPayPwdCodeBean.java

+package com.xxrv.wallet.bean;
+
+import com.ruiwenliu.wrapper.base.BaseBean;
+
+
+public class SetPayPwdCodeBean extends BaseBean {
+
+
+    private boolean data;
+
+
+    public boolean isData() {
+        return data;
+    }
+
+    public void setData(boolean data) {
+        this.data = data;
+    }
+}