From e2b0c9ce8caa4072fbfaed1d53ba16af12a37874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Thu, 18 Dec 2025 15:53:48 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=EF=BC=8C=E5=BD=93=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=90=8E=E6=89=8D=E4=BC=9A=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=88=E4=B8=A4=E4=B8=AA=E5=9C=B0=E6=96=B9=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A1=EF=BC=9A=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E4=BA=8C=E6=AC=A1=E7=A1=AE=E8=AE=A4=E5=92=8C=E6=B3=A8?= =?UTF-8?q?=E9=94=80=E7=9A=84=E4=BA=8C=E6=AC=A1=E7=A1=AE=E8=AE=A4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xscm/moduleutil/http/ApiServer.java | 2 +- .../xscm/moduleutil/http/RetrofitClient.java | 22 +++++++++++++++++-- .../login/present/LoginPresenter.java | 4 ++-- .../user/activity/ChangPassActivity.java | 4 ++-- .../activity/PhoneReplacementActivity.java | 4 ++-- .../presenter/ChangePasswordPresenter.java | 4 ++-- .../presenter/PhoneReplacementPresenter.java | 4 ++-- .../user/presenter/SettingPresenter.java | 4 ++-- .../user/presenter/WithdrawalPresenter.java | 4 ++-- .../qxcm/qxlive/PasswordLoginActivity.java | 3 ++- 10 files changed, 37 insertions(+), 18 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java index a27d94fe..26ab62a5 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java @@ -27,7 +27,7 @@ public interface ApiServer { @FormUrlEncoded //请求验证码 @POST(Constants.SEND_CODE) - Observable> sendCode(@Field("mobile") String mobile, @Field("event") String event); + Call> sendCode(@Field("mobile") String mobile, @Field("event") String event); @FormUrlEncoded @POST(Constants.LOGIN) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index 564aa051..4090997e 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -219,8 +219,26 @@ public class RetrofitClient { sApiServer.appUpdate().compose(new DefaultTransformer<>()).subscribe(observer); } - public void sendCode(String mobile, String event, BaseObserver observer) { - sApiServer.sendCode(mobile, event).compose(new DefaultTransformer<>()).subscribe(observer); + public void sendCode(String mobile, String event, BaseObserver observer) { + sApiServer.sendCode(mobile, event).enqueue(new Callback>() { + + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel 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> call, Throwable t) { + LogUtils.e("sendCode", t.getMessage()); + } + }); } public void mobileView(String mobile, String new_mobile, String sms_code, BaseObserver observer) { diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/login/present/LoginPresenter.java b/MainModule/src/main/java/com/xscm/modulemain/activity/login/present/LoginPresenter.java index b6626cd8..fbfc973f 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/login/present/LoginPresenter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/login/present/LoginPresenter.java @@ -32,7 +32,7 @@ public class LoginPresenter extends BasePresenter implement @Override public void sendCode(String phoneNumber, int type) { - api.sendCode(phoneNumber, "default", new BaseObserver() { + api.sendCode(phoneNumber, "default", new BaseObserver() { @Override public void onSubscribe(Disposable d) { @@ -40,7 +40,7 @@ public class LoginPresenter extends BasePresenter implement } @Override - public void onNext(Object o) { + public void onNext(String o) { MvpRef.get().sendCodeSuccess1(o + ""); } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ChangPassActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ChangPassActivity.java index 0523b724..6f56468b 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ChangPassActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ChangPassActivity.java @@ -37,7 +37,7 @@ public class ChangPassActivity extends BaseMvpActivity() { + api.sendCode(phoneNumber,type, new BaseObserver() { @Override public void onSubscribe(Disposable d) { @@ -23,7 +23,7 @@ public class ChangePasswordPresenter extends BasePresenter() { + api.sendCode(phoneNumber, type, new BaseObserver() { @Override public void onSubscribe(Disposable d) { @@ -30,7 +30,7 @@ public class PhoneReplacementPresenter extends BasePresenter(mView); } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/SettingPresenter.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/SettingPresenter.java index cac35236..81f8c04b 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/SettingPresenter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/SettingPresenter.java @@ -179,7 +179,7 @@ public class SettingPresenter extends BasePresenter impleme @Override public void sendCode(String phoneNumber, int type) { - api.sendCode(phoneNumber, type + "", new BaseObserver() { + api.sendCode(phoneNumber, type + "", new BaseObserver() { @Override public void onSubscribe(Disposable d) { @@ -187,7 +187,7 @@ public class SettingPresenter extends BasePresenter impleme } @Override - public void onNext(Object o) { + public void onNext(String o) { } }); diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/WithdrawalPresenter.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/WithdrawalPresenter.java index a4962bca..503aaf00 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/WithdrawalPresenter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/WithdrawalPresenter.java @@ -99,7 +99,7 @@ public class WithdrawalPresenter extends BasePresenter i @Override public void sendCode(String phoneNumber, int type) { - api.sendCode(phoneNumber, type + "", new BaseObserver() { + api.sendCode(phoneNumber, type + "", new BaseObserver() { @Override public void onSubscribe(Disposable d) { @@ -107,7 +107,7 @@ public class WithdrawalPresenter extends BasePresenter i } @Override - public void onNext(Object o) { + public void onNext(String o) { } }); diff --git a/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java b/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java index 1af366f5..63a90807 100644 --- a/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java +++ b/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java @@ -525,7 +525,7 @@ public class PasswordLoginActivity extends BaseMvpActivity