1:修改获取验证码,当返回后才会更新页面(两个地方没有修改:1:提现的二次确认和注销的二次确认)
This commit is contained in:
@@ -27,7 +27,7 @@ public interface ApiServer {
|
||||
|
||||
@FormUrlEncoded //请求验证码
|
||||
@POST(Constants.SEND_CODE)
|
||||
Observable<BaseModel<Object>> sendCode(@Field("mobile") String mobile, @Field("event") String event);
|
||||
Call<BaseModel<String>> sendCode(@Field("mobile") String mobile, @Field("event") String event);
|
||||
|
||||
@FormUrlEncoded
|
||||
@POST(Constants.LOGIN)
|
||||
|
||||
@@ -219,8 +219,26 @@ public class RetrofitClient {
|
||||
sApiServer.appUpdate().compose(new DefaultTransformer<>()).subscribe(observer);
|
||||
}
|
||||
|
||||
public void sendCode(String mobile, String event, BaseObserver<Object> observer) {
|
||||
sApiServer.sendCode(mobile, event).compose(new DefaultTransformer<>()).subscribe(observer);
|
||||
public void sendCode(String mobile, String event, BaseObserver<String> observer) {
|
||||
sApiServer.sendCode(mobile, event).enqueue(new Callback<BaseModel<String>>() {
|
||||
|
||||
@Override
|
||||
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
|
||||
if (response.code() == 200) {
|
||||
BaseModel<String> body = response.body();
|
||||
if (body.getCode() == 1) {
|
||||
observer.onNext(body.getMsg());
|
||||
} else if (body.getCode() == 0) {
|
||||
ToastUtils.showLong(body.getMsg());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(Call<BaseModel<String>> call, Throwable t) {
|
||||
LogUtils.e("sendCode", t.getMessage());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void mobileView(String mobile, String new_mobile, String sms_code, BaseObserver<String> observer) {
|
||||
|
||||
@@ -32,7 +32,7 @@ public class LoginPresenter extends BasePresenter<LoginContacter.View> implement
|
||||
|
||||
@Override
|
||||
public void sendCode(String phoneNumber, int type) {
|
||||
api.sendCode(phoneNumber, "default", new BaseObserver<Object>() {
|
||||
api.sendCode(phoneNumber, "default", new BaseObserver<String>() {
|
||||
|
||||
@Override
|
||||
public void onSubscribe(Disposable d) {
|
||||
@@ -40,7 +40,7 @@ public class LoginPresenter extends BasePresenter<LoginContacter.View> implement
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(Object o) {
|
||||
public void onNext(String o) {
|
||||
MvpRef.get().sendCodeSuccess1(o + "");
|
||||
}
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ public class ChangPassActivity extends BaseMvpActivity<ChangePasswordPresenter,
|
||||
|
||||
private void onClick(View view) {
|
||||
if (view.getId() == R.id.tv_send_code) {
|
||||
sendCodeSuccess2(userBean.getMobile());
|
||||
|
||||
if (MvpPre != null) {
|
||||
MvpPre.sendCode(userBean.getMobile(), "4");
|
||||
}
|
||||
@@ -108,7 +108,7 @@ public class ChangPassActivity extends BaseMvpActivity<ChangePasswordPresenter,
|
||||
|
||||
@Override
|
||||
public void sendCodeSuccess1(String phoneNumber) {
|
||||
|
||||
sendCodeSuccess2(userBean.getMobile());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -67,7 +67,7 @@ public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPr
|
||||
MvpPre = bindPresenter();
|
||||
}
|
||||
MvpPre.sendCode(mBinding.edPhone.getText().toString(), type);
|
||||
sendCodeSuccess2(mBinding.edPhone.getText().toString());
|
||||
|
||||
} else if (view.getId() == R.id.btnSubmit) {
|
||||
|
||||
if (mBinding.edPhone.getText().toString().isEmpty()) {
|
||||
@@ -123,7 +123,7 @@ public class PhoneReplacementActivity extends BaseMvpActivity<PhoneReplacementPr
|
||||
|
||||
@Override
|
||||
public void sendCodeSuccess1(String phoneNumber) {
|
||||
|
||||
sendCodeSuccess2(mBinding.edPhone.getText().toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -15,7 +15,7 @@ public class ChangePasswordPresenter extends BasePresenter<ChangePasswordConacto
|
||||
|
||||
@Override
|
||||
public void sendCode(String phoneNumber, String type) {
|
||||
api.sendCode(phoneNumber,type, new BaseObserver<Object>() {
|
||||
api.sendCode(phoneNumber,type, new BaseObserver<String>() {
|
||||
|
||||
@Override
|
||||
public void onSubscribe(Disposable d) {
|
||||
@@ -23,7 +23,7 @@ public class ChangePasswordPresenter extends BasePresenter<ChangePasswordConacto
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(Object o) {
|
||||
public void onNext(String o) {
|
||||
MvpRef.get().sendCodeSuccess1(phoneNumber);
|
||||
}
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementCon
|
||||
|
||||
@Override
|
||||
public void sendCode(String phoneNumber, String type) {
|
||||
api.sendCode(phoneNumber, type, new BaseObserver<Object>() {
|
||||
api.sendCode(phoneNumber, type, new BaseObserver<String>() {
|
||||
|
||||
@Override
|
||||
public void onSubscribe(Disposable d) {
|
||||
@@ -30,7 +30,7 @@ public class PhoneReplacementPresenter extends BasePresenter<PhoneReplacementCon
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(Object o) {
|
||||
public void onNext(String o) {
|
||||
if (MvpRef == null) {
|
||||
MvpRef = new WeakReference<>(mView);
|
||||
}
|
||||
|
||||
@@ -179,7 +179,7 @@ public class SettingPresenter extends BasePresenter<SettingConacts.View> impleme
|
||||
|
||||
@Override
|
||||
public void sendCode(String phoneNumber, int type) {
|
||||
api.sendCode(phoneNumber, type + "", new BaseObserver<Object>() {
|
||||
api.sendCode(phoneNumber, type + "", new BaseObserver<String>() {
|
||||
|
||||
@Override
|
||||
public void onSubscribe(Disposable d) {
|
||||
@@ -187,7 +187,7 @@ public class SettingPresenter extends BasePresenter<SettingConacts.View> impleme
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(Object o) {
|
||||
public void onNext(String o) {
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
@@ -99,7 +99,7 @@ public class WithdrawalPresenter extends BasePresenter<WithdrawalConacts.View> i
|
||||
|
||||
@Override
|
||||
public void sendCode(String phoneNumber, int type) {
|
||||
api.sendCode(phoneNumber, type + "", new BaseObserver<Object>() {
|
||||
api.sendCode(phoneNumber, type + "", new BaseObserver<String>() {
|
||||
|
||||
@Override
|
||||
public void onSubscribe(Disposable d) {
|
||||
@@ -107,7 +107,7 @@ public class WithdrawalPresenter extends BasePresenter<WithdrawalConacts.View> i
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNext(Object o) {
|
||||
public void onNext(String o) {
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
@@ -525,7 +525,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
|
||||
ToastUtils.show("请输入手机号");
|
||||
return;
|
||||
}
|
||||
sendCodeSuccess(phone);
|
||||
|
||||
MvpPre.sendCode(phone, 1);
|
||||
}else if (id == R.id.iv_eye) {
|
||||
|
||||
@@ -601,6 +601,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
|
||||
@Override
|
||||
public void sendCodeSuccess1(String s) {
|
||||
LogUtils.e(s);
|
||||
sendCodeSuccess(mBinding.edPhone.getText().toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user