From 99b5c6a06723f7a5c5d3425b67aa1314ffa10c0a Mon Sep 17 00:00:00 2001
From: oujunhui <313127320@qq.com>
Date: Thu, 14 May 2020 13:31:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erban/ui/setting/ModifyPwdActivity.java   | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/ModifyPwdActivity.java b/app/src/main/java/com/yizhuan/erban/ui/setting/ModifyPwdActivity.java
index 5b44c04e3..44cb8f726 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/setting/ModifyPwdActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/setting/ModifyPwdActivity.java
@@ -7,6 +7,7 @@ import android.text.InputFilter;
 import android.text.TextUtils;
 import android.view.View;
 
+import com.coorchice.library.utils.LogUtils;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.trello.rxlifecycle3.android.ActivityEvent;
 import com.yizhuan.erban.R;
@@ -25,6 +26,7 @@ import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
 import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
 
 import io.reactivex.SingleObserver;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 
 @ActLayoutRes(R.layout.activity_modify_pwd)
@@ -165,19 +167,28 @@ public class ModifyPwdActivity extends BaseBindingActivity<ActivityModifyPwdBind
                     return;
                 }
                 mBinding.btnGetCode.setClickable(false);
-                CodeModel.get().sendCode(userInfo.getPhone(), CodeType.RESET_PAY_PSW)
+                AuthModel.get()
+                        .sendLoginCode(userInfo.getPhone(),CodeType.RESET_PSW)
+                        .observeOn(AndroidSchedulers.mainThread())
                         .compose(bindUntilEvent(ActivityEvent.DESTROY))
-                        .subscribe(new DontWarnObserver<String>() {
+                        .subscribe(new SingleObserver<String>() {
                             @Override
-                            public void accept(String s, String error) {
-                                super.accept(s, error);
-                                if (error != null) {
-                                    mBinding.btnGetCode.setClickable(true);
-                                    return;
-                                }
+                            public void onSubscribe(Disposable d) {
+
+                            }
+
+                            @Override
+                            public void onSuccess(String s) {
                                 mBinding.tvCodeTips.setText(getString(R.string.send_code_success_tips, userInfo.getPhone()));
                                 startCountDownTimer();
                             }
+
+                            @Override
+                            public void onError(Throwable e) {
+                                mBinding.btnGetCode.setClickable(true);
+//                            finish();
+                                LogUtils.e( "获取短信失败!");
+                            }
                         });
                 break;
         }