Merge branch '20230926_updatepwd' into dev

BaseLibrary/src/main/java/com/cooleshow/base/router/RouterPath.kt

@@ -58,6 +58,9 @@ object RouterPath {
             const val PATH_BIND_PASSWORD = "/userCenter/bindPwd"
             const val COMMON_EMPTY_ACTIVITY = "/userCenter/CommEmptyActivity"
             const val SIGN_OUT_ACCOUNT = "/userCenter/SignOutAccountActivity"
+            const val UPDATE_PASSWORD = "/userCenter/UpdatePasswordActivity"
+            const val FORGET_PASSWORD = "/userCenter/ForgetPasswordActivity"
+            const val MINE_MODIFY_PASSWORD = "/userCenter/ModifyPasswordActivity"
         }
     }
 

institution/src/main/java/com/cooleshow/institution/stu/ui/setting/PersonalSettingActivity.java

@@ -102,8 +102,7 @@ public class PersonalSettingActivity extends BaseMVPActivity<JgActivityPersonalS
             ARouter.getInstance().build(RouterPath.MineCenter.MINE_CHECK_MODIFY_PHONENUM)
                     .navigation(this, MODIFY_PHONE);
         } else if (id == R.id.cl_modify_psd) {
-            ARouter.getInstance().build(RouterPath.MineCenter.MINE_MODIFY_PASSWORD)
-                    .withString("phoneNum", UserHelper.getUserPhone())
+            ARouter.getInstance().build(RouterPath.UserCenter.UPDATE_PASSWORD)
                     .navigation();
         } else if (id == R.id.cl_certification) {
             if (viewBinding.tvCertificationStatus.getText().equals("未认证")) {

student/src/main/java/com/cooleshow/student/ui/mine/ModifyPasswordActivity.java

@@ -44,7 +44,6 @@ import io.rong.imkit.utils.StatusBarUtil;
  * @author Ryan
  * 类说明：
  */
-@Route(path = RouterPath.MineCenter.MINE_MODIFY_PASSWORD)
 public class ModifyPasswordActivity extends BaseMVPActivity<ActivityModifyPasswordBinding, ModifyPasswordPresenter> implements ModifyPasswordContract.ModifyPasswordView, View.OnClickListener {
 
     private ImgVerifyCodeDialog mImgVerifyCodeDialog;

student/src/main/java/com/cooleshow/student/ui/mine/PersonalSettingActivity.java

@@ -110,8 +110,7 @@ public class PersonalSettingActivity extends BaseMVPActivity<ActivityPersonalSet
                         .navigation(this, MODIFY_PHONE);
                 break;
             case R.id.cl_modify_psd:
-                ARouter.getInstance().build(RouterPath.MineCenter.MINE_MODIFY_PASSWORD)
-                        .withString("phoneNum", UserHelper.getUserPhone())
+                ARouter.getInstance().build(RouterPath.UserCenter.UPDATE_PASSWORD)
                         .navigation();
                 break;
             case R.id.cl_certification:

usercenter/src/main/AndroidManifest.xml

@@ -42,5 +42,20 @@
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:exported="false"
             android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".ui.activity.setting.ModifyPasswordActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".ui.activity.setting.ForgetPasswordActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".ui.activity.setting.UpdatePasswordActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:screenOrientation="portrait" />
     </application>
 </manifest>

usercenter/src/main/java/com/cooleshow/usercenter/data/api/UserApi.kt

@@ -6,10 +6,10 @@ import com.cooleshow.base.common.BaseConstant
 import com.cooleshow.base.data.net.BaseResponse
 import com.cooleshow.usercenter.bean.StudentUserInfo
 import com.cooleshow.usercenter.bean.TeacherUserInfo
-import com.cooleshow.usercenter.bean.UserInfo
 import com.cooleshow.usercenter.bean.UserLoginInfo
 import com.cooleshow.usercenter.data.protocol.RegisterReq
 import io.reactivex.rxjava3.core.Observable
+import okhttp3.RequestBody
 import retrofit2.http.*
 
 
@@ -138,7 +138,7 @@ interface UserApi {
 
 
     /**
-<<<<<<< HEAD
+    <<<<<<< HEAD
      * 校验图片验证码
      *
      *
@@ -175,6 +175,53 @@ interface UserApi {
      *
      * @return
      */
-    @GET(BaseConstant.AUTH_GROUP + "checkPassword")
-    fun checkOldPwd(): Observable<BaseResponse<StudentUserInfo?>?>?
+    @POST(BaseConstant.AUTH_GROUP + "user/checkPassword")
+    fun checkOldPwd(@Body body: RequestBody): Observable<BaseResponse<Object?>?>?
+
+    /**
+     * 手机验证码修改密码
+     *
+     * @return
+     */
+    @FormUrlEncoded
+    @POST(BaseConstant.AUTH_GROUP + "user/setPassword ")
+    fun updatePassword(@FieldMap params: Map<String?, String?>?): Observable<BaseResponse<Any?>?>?
+
+
+    /**
+     * 发送登录短信验证码
+     *
+     * @param body mobile 手机号
+     * type:类型（PASSWD:修改密码，LOGIN:登录，REGISTER:注册,BANK:绑定银行卡PHONE:修改手机号））
+     * @return
+     */
+    @FormUrlEncoded
+    @POST("{group_name}" + "/code/sendSmsCode")
+    fun sendSmsCode(
+        @Path("group_name") group_name: String,
+        @FieldMap params: Map<String?, String?>?
+    ): Observable<BaseResponse<Any?>?>?
+
+    /**
+     * 校验图片验证码
+     *
+     *
+     * type:类型（PASSWD:修改密码，LOGIN:登录或注册,BANK:绑定银行卡,PHONE:修改手机号）
+     *
+     * @return
+     */
+    @FormUrlEncoded
+    @POST("{group_name}" + "/code/verifyImageCode")
+    fun verifyImgCode(
+        @Path("group_name") group_name: String,
+        @FieldMap map: Map<String?, String?>?
+    ): Observable<BaseResponse<Any?>?>?
+
+
+    /**
+     * 校验验证码
+     * @return
+     */
+    @POST(BaseConstant.AUTH_GROUP + "user/checkVerityCode")
+    fun checkSmsCode(@Body body: RequestBody): Observable<BaseResponse<Any?>?>?
 }

usercenter/src/main/java/com/cooleshow/usercenter/presenter/ForgetPasswordPresenter.java

@@ -0,0 +1,99 @@
+package com.cooleshow.usercenter.presenter;
+
+import com.cooleshow.base.common.BaseConstant;
+import com.cooleshow.base.presenter.BasePresenter;
+import com.cooleshow.base.rx.BaseObserver;
+import com.cooleshow.base.utils.RequestBodyUtil;
+import com.cooleshow.usercenter.bean.SetDetailBean;
+import com.cooleshow.usercenter.data.api.UserApi;
+import com.cooleshow.usercenter.presenter.contract.ForgetPasswordContract;
+import com.cooleshow.usercenter.presenter.contract.UpdatePasswordContract;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * Author by pq, Date on 2022/4/19.
+ */
+public class ForgetPasswordPresenter extends BasePresenter<ForgetPasswordContract.View> implements ForgetPasswordContract.Presenter {
+
+
+    public void checkOldPwd(String oldPwd) {
+        if (getView() != null) {
+            getView().showLoading();
+        }
+        JSONObject jsonObject =new JSONObject();
+        try {
+            jsonObject.put("password",oldPwd);
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
+        }
+        addSubscribe(create(UserApi.class).checkOldPwd(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<Object>(getView()) {
+            @Override
+            protected void onSuccess(Object data) {
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+            }
+        });
+    }
+
+    /**
+     * 图片验证码验证
+     * @param phone
+     * @param imgCode
+     */
+    public void verifyImgCode(String phone, String imgCode) {
+        if (getView() != null) {
+            getView().showLoading();
+        }
+        Map<String, String> params = new HashMap<>();
+        params.put("code", imgCode);
+        params.put("phone", phone);
+        addSubscribe(create(UserApi.class).verifyImgCode(BaseConstant.CLIENT_API_GROUP_NAME,params), new BaseObserver<Object>(getView()) {
+            @Override
+            protected void onSuccess(Object data) {
+                if (getView() != null) {
+                    getView().verifyImgCodeSuccess(phone);
+                }
+            }
+
+        });
+    }
+
+    public void sendSmsCode(Map<String,String> map){
+        getView().showLoading();
+        addSubscribe(create(UserApi.class).sendSmsCode(BaseConstant.getClientApiGroup(),map), new BaseObserver<SetDetailBean>(getView()) {
+            @Override
+            protected void onSuccess(SetDetailBean data) {
+                if (getView() != null) {
+                    getView().sendSmsCodeSuccess(data);
+                }
+            }
+        });
+    }
+
+    public void checkSmsCode(String code) {
+        getView().showLoading();
+        JSONObject jsonObject =new JSONObject();
+        try {
+            jsonObject.put("code",code);
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
+        }
+        addSubscribe(create(UserApi.class).checkSmsCode(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<Object>(getView()) {
+            @Override
+            protected void onSuccess(Object data) {
+                if (getView() != null) {
+                    getView().checkSmsCodeSuccess();
+                }
+            }
+        });
+    }
+}

usercenter/src/main/java/com/cooleshow/usercenter/presenter/ModifyPasswordPresenter.java

@@ -0,0 +1,88 @@
+package com.cooleshow.usercenter.presenter;
+
+import com.cooleshow.base.common.BaseConstant;
+import com.cooleshow.base.presenter.BasePresenter;
+import com.cooleshow.base.rx.BaseObserver;
+import com.cooleshow.usercenter.bean.SetDetailBean;
+import com.cooleshow.usercenter.data.api.UserApi;
+import com.cooleshow.usercenter.presenter.contract.ModifyPasswordContract;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 创建日期：2022/5/17 13:36
+ *
+ * @author Ryan
+ * 类说明：
+ */
+public class ModifyPasswordPresenter extends BasePresenter<ModifyPasswordContract.ModifyPasswordView> implements ModifyPasswordContract.Presenter {
+    public void updatePassword(Map<String, String> requestData) {
+        getView().showLoading();
+        addSubscribe(create(UserApi.class).updatePassword(requestData), new BaseObserver<SetDetailBean>(getView()) {
+            @Override
+            protected void onSuccess(SetDetailBean data) {
+                if (getView() != null) {
+                    getView().updatePasswordSuccess(data);
+                }
+            }
+
+            @Override
+            public void onComplete() {
+                super.onComplete();
+                getView().hideLoading();
+            }
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+            }
+        });
+
+    }
+    public void sendSmsCode(Map<String,String> map){
+        getView().showLoading();
+        addSubscribe(create(UserApi.class).sendSmsCode(BaseConstant.getClientApiGroup(),map), new BaseObserver<SetDetailBean>(getView()) {
+            @Override
+            protected void onSuccess(SetDetailBean data) {
+                if (getView() != null) {
+                    getView().sendSmsCodeSuccess(data);
+                }
+            }
+        });
+    }
+
+    /**
+     * 图片验证码验证
+     * @param phone
+     * @param imgCode
+     */
+    public void verifyImgCode(String phone, String imgCode) {
+        if (getView() != null) {
+            getView().showLoading();
+        }
+        Map<String, String> params = new HashMap<>();
+        params.put("code", imgCode);
+        params.put("phone", phone);
+        addSubscribe(create(UserApi.class).verifyImgCode(BaseConstant.CLIENT_API_GROUP_NAME,params), new BaseObserver<Object>(getView()) {
+            @Override
+            protected void onSuccess(Object data) {
+                if (getView() != null) {
+                    getView().verifyImgCodeSuccess(phone);
+                }
+            }
+
+            @Override
+            public void onComplete() {
+                super.onComplete();
+                if (getView() != null) {
+                    getView().hideLoading();
+                }
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+            }
+        });
+    }
+}

usercenter/src/main/java/com/cooleshow/usercenter/presenter/UpdatePasswordPresenter.java

@@ -6,10 +6,14 @@ import com.cooleshow.base.bean.QueryParamsConfigBean;
 import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
+import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.usercenter.data.api.UserApi;
 import com.cooleshow.usercenter.presenter.contract.BindPasswordContract;
 import com.cooleshow.usercenter.presenter.contract.UpdatePasswordContract;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 
 /**
  * Author by pq, Date on 2022/4/19.
@@ -17,11 +21,22 @@ import com.cooleshow.usercenter.presenter.contract.UpdatePasswordContract;
 public class UpdatePasswordPresenter extends BasePresenter<UpdatePasswordContract.View> implements UpdatePasswordContract.Presenter {
 
 
-    public void checkOldPwd() {
-        getView().showLoading();
-        addSubscribe(create(UserApi.class).checkOldPwd(), new BaseObserver<Object>(getView()) {
+    public void checkOldPwd(String oldPwd) {
+        if (getView() != null) {
+            getView().showLoading();
+        }
+        JSONObject jsonObject =new JSONObject();
+        try {
+            jsonObject.put("password",oldPwd);
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
+        }
+        addSubscribe(create(UserApi.class).checkOldPwd(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<Object>(getView()) {
             @Override
             protected void onSuccess(Object data) {
+                if (getView() != null) {
+                    getView().checkPwdSuccess();
+                }
             }
 
             @Override

usercenter/src/main/java/com/cooleshow/usercenter/presenter/contract/ForgetPasswordContract.java

@@ -0,0 +1,23 @@
+package com.cooleshow.usercenter.presenter.contract;
+
+import com.cooleshow.base.presenter.view.BaseView;
+import com.cooleshow.usercenter.bean.SetDetailBean;
+
+/**
+ * Author by pq, Date on 2022/4/20.
+ */
+public interface ForgetPasswordContract {
+
+    interface View extends BaseView {
+
+        void verifyImgCodeSuccess(String phone);
+
+        void sendSmsCodeSuccess(SetDetailBean data);
+
+        void checkSmsCodeSuccess();
+
+    }
+
+    interface Presenter {
+    }
+}

usercenter/src/main/java/com/cooleshow/usercenter/presenter/contract/ModifyPasswordContract.java

@@ -0,0 +1,20 @@
+package com.cooleshow.usercenter.presenter.contract;
+
+import com.cooleshow.base.presenter.view.BaseView;
+
+/**
+ * 创建日期：2022/5/17 13:36
+ *
+ * @author Ryan
+ * 类说明：
+ */
+public interface ModifyPasswordContract {
+    interface ModifyPasswordView extends BaseView {
+        void updatePasswordSuccess(Object object);
+        void sendSmsCodeSuccess(Object object);
+        void verifyImgCodeSuccess(String phone);
+    }
+
+    interface Presenter {
+    }
+}

usercenter/src/main/java/com/cooleshow/usercenter/presenter/contract/UpdatePasswordContract.java

@@ -9,6 +9,9 @@ import com.cooleshow.base.presenter.view.BaseView;
 public interface UpdatePasswordContract {
 
     interface View extends BaseView {
+        void checkPwdSuccess();
+
+
     }
 
     interface Presenter {

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/setting/ForgetPasswordActivity.java

@@ -0,0 +1,191 @@
+package com.cooleshow.usercenter.ui.activity.setting;
+
+import android.os.Bundle;
+import android.os.CountDownTimer;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.view.View;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.cooleshow.base.constanst.StyleConfig;
+import com.cooleshow.base.router.RouterPath;
+import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
+import com.cooleshow.base.utils.UiUtils;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
+import com.cooleshow.base.widgets.dialog.ImgVerifyCodeDialog;
+import com.cooleshow.usercenter.R;
+import com.cooleshow.usercenter.bean.SetDetailBean;
+import com.cooleshow.usercenter.databinding.AcForgetPwdLayoutBinding;
+import com.cooleshow.usercenter.helper.UserHelper;
+import com.cooleshow.usercenter.presenter.ForgetPasswordPresenter;
+import com.cooleshow.usercenter.presenter.contract.ForgetPasswordContract;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import androidx.annotation.Nullable;
+
+/**
+ * Author by pq, Date on 2023/9/26.
+ */
+@Route(path = RouterPath.UserCenter.FORGET_PASSWORD)
+public class ForgetPasswordActivity extends BaseMVPActivity<AcForgetPwdLayoutBinding, ForgetPasswordPresenter> implements ForgetPasswordContract.View, View.OnClickListener {
+
+    private ImgVerifyCodeDialog mImgVerifyCodeDialog;
+    private String mPhoneNum;
+
+
+    CountDownTimer mDownTimer = new CountDownTimer(60000, 1000) {
+        @Override
+        public void onTick(long millisUntilFinished) {
+            int untilTime = (int) (millisUntilFinished / 1000);
+            updateTimeCountText(String.valueOf(untilTime));
+        }
+
+        @Override
+        public void onFinish() {
+            resetCount();
+        }
+    };
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StyleConfig.setTheme(this);
+        super.onCreate(savedInstanceState);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
+    }
+
+    @Override
+    protected void initView() {
+        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "忘记密码");
+        mPhoneNum = UserHelper.getUserPhone();
+        if (!TextUtils.isEmpty(mPhoneNum)) {
+            try {
+                String cPhone = mPhoneNum.substring(0, 3) + "****" + mPhoneNum.substring(7, mPhoneNum.length());
+                viewBinding.tvPhone.setText(cPhone);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    @Override
+    public void initData() {
+        super.initData();
+        initListener();
+    }
+
+    private void initListener() {
+        viewBinding.tvConfirm.setOnClickListener(this);
+        viewBinding.tvGetAuthCode.setOnClickListener(this);
+    }
+
+    @Override
+    protected AcForgetPwdLayoutBinding getLayoutView() {
+        return AcForgetPwdLayoutBinding.inflate(getLayoutInflater());
+    }
+
+    @Override
+    protected ForgetPasswordPresenter createPresenter() {
+        return new ForgetPasswordPresenter();
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (UiUtils.isFastClick()) {
+            return;
+        }
+        int id = v.getId();
+        if (id == R.id.tv_get_auth_code) {
+            showImgVerifyCodeDialog();
+            return;
+        }
+        if (id == R.id.tv_confirm) {
+            String code = viewBinding.etAuthCode.getText().toString().trim();
+            if (TextUtils.isEmpty(code)) {
+                ToastUtil.getInstance().showShort("请输入验证码");
+                return;
+            }
+            presenter.checkSmsCode(code);
+            return;
+        }
+    }
+
+    private void showImgVerifyCodeDialog() {
+        if (mImgVerifyCodeDialog == null) {
+            mImgVerifyCodeDialog = new ImgVerifyCodeDialog(this);
+        }
+        if (!mImgVerifyCodeDialog.isShowing()) {
+            mImgVerifyCodeDialog.show();
+        }
+        mImgVerifyCodeDialog.setPhone(mPhoneNum);
+        mImgVerifyCodeDialog.setOnEventListener(new ImgVerifyCodeDialog.OnEventListener() {
+            @Override
+            public void onVerifyImgCode(String phone, String imgCode) {
+                if (presenter != null) {
+                    presenter.verifyImgCode(phone, imgCode);
+                }
+            }
+        });
+    }
+
+
+    private void updateTimeCountText(String time) {
+        viewBinding.tvGetAuthCode.setText(String.format("%ss", time));
+        viewBinding.tvGetAuthCode.setClickable(false);
+    }
+
+    private void resetCount() {
+        viewBinding.tvGetAuthCode.setClickable(true);
+        viewBinding.tvGetAuthCode.setText("获取验证码");
+    }
+
+    @Override
+    public void verifyImgCodeSuccess(String phone) {
+        if (!checkActivityExist()) {
+            return;
+        }
+        if (mImgVerifyCodeDialog != null) {
+            mImgVerifyCodeDialog.dismiss();
+        }
+        Map<String, String> map = new HashMap<>();
+        map.put("mobile", phone);
+        map.put("type", "PASSWD");
+        presenter.sendSmsCode(map);
+    }
+
+    @Override
+    public void sendSmsCodeSuccess(SetDetailBean data) {
+        if (!checkActivityExist()) {
+            return;
+        }
+        ToastUtil.getInstance().showShort("验证码发送成功，请注意查收!");
+        if (mDownTimer != null) {
+            mDownTimer.cancel();
+            mDownTimer.start();
+            viewBinding.tvGetAuthCode.setClickable(false);
+        }
+    }
+
+    @Override
+    public void checkSmsCodeSuccess() {
+        if (!checkActivityExist()) {
+            return;
+        }
+        ARouter.getInstance().build(RouterPath.UserCenter.MINE_MODIFY_PASSWORD)
+                .withString("phoneNum", UserHelper.getUserPhone())
+                .withBoolean("isNeedSmsCode", false)
+                .navigation();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mDownTimer != null) {
+            mDownTimer.cancel();
+            mDownTimer = null;
+        }
+    }
+}

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/setting/ModifyPasswordActivity.java

@@ -0,0 +1,267 @@
+package com.cooleshow.usercenter.ui.activity.setting;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.text.TextUtils;
+import android.view.View;
+
+import com.alibaba.android.arouter.facade.annotation.Autowired;
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.cooleshow.base.constanst.StyleConfig;
+import com.cooleshow.base.router.RouterPath;
+import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.ToastUtil;
+import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
+import com.cooleshow.base.widgets.dialog.ImgVerifyCodeDialog;
+import com.cooleshow.usercenter.R;
+import com.cooleshow.usercenter.constants.UserConstants;
+import com.cooleshow.usercenter.databinding.AcModifyPasswordBinding;
+import com.cooleshow.usercenter.helper.UserHelper;
+import com.cooleshow.usercenter.presenter.ModifyPasswordPresenter;
+import com.cooleshow.usercenter.presenter.contract.ModifyPasswordContract;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import androidx.annotation.Nullable;
+
+/**
+ * 创建日期：2022/5/17 13:33
+ *
+ * @author Ryan
+ * 类说明：
+ */
+@Route(path = RouterPath.UserCenter.MINE_MODIFY_PASSWORD)
+public class ModifyPasswordActivity extends BaseMVPActivity<AcModifyPasswordBinding, ModifyPasswordPresenter> implements ModifyPasswordContract.ModifyPasswordView, View.OnClickListener {
+
+    private ImgVerifyCodeDialog mImgVerifyCodeDialog;
+    private boolean isNeedSmsCode = true;
+
+
+    @Autowired(name = "phoneNum")
+    String phoneNum;
+
+
+    @Override
+    public void onClick(View view) {
+        int id = view.getId();
+        if (id == R.id.tv_confirm) {
+            String password = viewBinding.etPassword.getText().toString().trim();
+            String password2 = viewBinding.etPassword2.getText().toString().trim();
+            if (!checkPwd(password, password2)) {
+                return;
+            }
+
+            String authCode = viewBinding.etAuthCode.getText().toString().trim();
+            if (isNeedSmsCode && TextUtils.isEmpty(authCode)) {
+                ToastUtil.getInstance().showShort("请输入验证码");
+                return;
+            }
+            Map<String, String> params = new HashMap<>();
+            params.put("id", UserHelper.getUserId());
+            if (!TextUtils.isEmpty(authCode)) {
+                params.put("code", authCode);
+            }
+            params.put("password", password);
+            presenter.updatePassword(params);
+        } else if (id == R.id.tv_get_auth_code) {
+            showImgVerifyCodeDialog();
+        }
+    }
+
+    private boolean checkPwd(String pwd, String pwd2) {
+        if (TextUtils.isEmpty(pwd) || pwd.length() < 6 || pwd.length() > 20) {
+            ToastUtil.getInstance().showShort("请输入6-20位密码");
+            return false;
+        }
+        if (TextUtils.isEmpty(pwd2) || pwd2.length() < 6 || pwd2.length() > 20) {
+            ToastUtil.getInstance().showShort("请输入6-20位密码");
+            return false;
+        }
+        if (!TextUtils.equals(pwd, pwd2)) {
+            ToastUtil.getInstance().showShort("两次密码输入不一致");
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StyleConfig.setTheme(this);
+        super.onCreate(savedInstanceState);
+        QMUIStatusBarHelper.setStatusBarLightMode(this);
+    }
+    @Override
+    protected void initView() {
+        ARouter.getInstance().inject(this);
+        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "修改密码");
+        isNeedSmsCode = getIntent().getBooleanExtra("isNeedSmsCode", true);
+        viewBinding.groupCode.setVisibility(isNeedSmsCode ? View.VISIBLE : View.GONE);
+
+        viewBinding.tvConfirm.setOnClickListener(this);
+        viewBinding.tvGetAuthCode.setOnClickListener(this);
+        if (!TextUtils.isEmpty(phoneNum)) {
+            try {
+                String cPhone = phoneNum.substring(0, 3) + "****" + phoneNum.substring(7, phoneNum.length());
+                viewBinding.tvPhone.setText(cPhone);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+
+
+    private void showImgVerifyCodeDialog() {
+        if (mImgVerifyCodeDialog == null) {
+            mImgVerifyCodeDialog = new ImgVerifyCodeDialog(ModifyPasswordActivity.this);
+        }
+        if (!mImgVerifyCodeDialog.isShowing()) {
+            mImgVerifyCodeDialog.show();
+        }
+        mImgVerifyCodeDialog.setPhone(phoneNum);
+        mImgVerifyCodeDialog.setOnEventListener(new ImgVerifyCodeDialog.OnEventListener() {
+            @Override
+            public void onVerifyImgCode(String phone, String imgCode) {
+                if (presenter != null) {
+                    presenter.verifyImgCode(phone, imgCode);
+                }
+            }
+        });
+    }
+
+    @Override
+    protected AcModifyPasswordBinding getLayoutView() {
+        return AcModifyPasswordBinding.inflate(getLayoutInflater());
+    }
+
+    @Override
+    protected ModifyPasswordPresenter createPresenter() {
+        return new ModifyPasswordPresenter();
+    }
+
+    @Override
+    public void updatePasswordSuccess(Object object) {
+        UserHelper.saveUserToken("");
+        ARouter.getInstance().build(RouterPath.UserCenter.PATH_VERIFY_LOGIN)
+                .withString(UserConstants.PHONE_NUM_KEY, UserHelper.getUserPhone())
+                .navigation();
+        finish();
+    }
+
+    @Override
+    public void sendSmsCodeSuccess(Object object) {
+        getCodeSuccess();
+    }
+
+    @Override
+    public void verifyImgCodeSuccess(String phone) {
+        if (isFinishing() || isDestroyed()) {
+            return;
+        }
+        if (mImgVerifyCodeDialog != null) {
+            mImgVerifyCodeDialog.dismiss();
+        }
+        Map<String, String> map = new HashMap<>();
+        map.put("mobile", phone);
+        map.put("type", "PASSWD");
+        presenter.sendSmsCode(map);
+    }
+
+
+    public void getCodeSuccess() {
+        ToastUtil.getInstance().showShort("验证码发送成功，请注意查收!");
+        startTimer();
+    }
+
+    /**
+     * 执行完成
+     */
+    public static final int EXECUTE_FINISH = 0X11000;
+    /**
+     * 执行中
+     */
+    public static final int EXECUTE_LOADING = 0X4000;
+    private int mTimerId = 60;
+
+    private TimerTask timerTask;
+
+    private Timer timer;
+
+    /**
+     * 开始倒计时
+     */
+    private void startTimer() {
+
+        if (timerTask == null) {
+            timerTask = new TimerTask() {
+                @Override
+                public void run() {
+                    Message msg = new Message();
+                    msg.what = EXECUTE_LOADING;
+                    msg.arg1 = --mTimerId;
+                    handler.sendMessage(msg);
+                }
+            };
+            timer = new Timer();
+            timer.schedule(timerTask, 100, 1000);
+        }
+    }
+
+    /**
+     * 结束计时
+     */
+    private void closeTimer() {
+        if (timer != null) {
+            timer.cancel();
+            timer = null;
+        }
+        if (timerTask != null) {
+            timerTask = null;
+        }
+        mTimerId = 60;
+        handler.sendEmptyMessage(EXECUTE_FINISH);
+    }
+
+    @SuppressLint("HandlerLeak")
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case EXECUTE_LOADING:
+                    viewBinding.tvGetAuthCode.setText(msg.arg1 + "s");
+                    viewBinding.tvGetAuthCode.setClickable(false);
+                    if (msg.arg1 == 0) {
+                        closeTimer();
+                        viewBinding.tvGetAuthCode.setClickable(true);
+                    }
+                    break;
+                case EXECUTE_FINISH:
+                    viewBinding.tvGetAuthCode.setClickable(true);
+                    viewBinding.tvGetAuthCode.setText("获取验证码");
+                    break;
+            }
+            super.handleMessage(msg);
+        }
+    };
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (timer != null) {
+            timer.cancel();
+            timer = null;
+        }
+        if (timerTask != null) {
+            timerTask = null;
+        }
+        if (handler != null) {
+            handler.removeCallbacksAndMessages(null);
+        }
+    }
+}

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/UpdatePasswordActivity.java → usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/setting/UpdatePasswordActivity.java

@@ -1,4 +1,4 @@
-package com.cooleshow.usercenter.ui.activity;
+package com.cooleshow.usercenter.ui.activity.setting;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -7,10 +7,12 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
 import com.bigkoo.pickerview.view.OptionsPickerView;
 import com.cooleshow.base.bean.QueryParamsConfigBean;
 import com.cooleshow.base.common.BaseApplication;
+import com.cooleshow.base.constanst.StyleConfig;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
@@ -20,8 +22,11 @@ import com.cooleshow.usercenter.constants.UserConstants;
 import com.cooleshow.usercenter.databinding.ActivityBindPwdLayoutBinding;
 import com.cooleshow.usercenter.databinding.ActivityUpdatePwdLayoutBinding;
 import com.cooleshow.usercenter.helper.PhoneCheckHelper;
+import com.cooleshow.usercenter.helper.UserHelper;
 import com.cooleshow.usercenter.presenter.BindPasswordPresenter;
+import com.cooleshow.usercenter.presenter.UpdatePasswordPresenter;
 import com.cooleshow.usercenter.presenter.contract.BindPasswordContract;
+import com.cooleshow.usercenter.presenter.contract.UpdatePasswordContract;
 
 import java.util.ArrayList;
 
@@ -31,10 +36,11 @@ import androidx.annotation.Nullable;
 /**
  * Author by pq, Date on 2022/4/19.
  */
-@Route(path = RouterPath.UserCenter.PATH_BIND_PASSWORD)
-public class UpdatePasswordActivity extends BaseMVPActivity<ActivityUpdatePwdLayoutBinding, BindPasswordPresenter> implements BindPasswordContract.BindPwdView, View.OnClickListener {
+@Route(path = RouterPath.UserCenter.UPDATE_PASSWORD)
+public class UpdatePasswordActivity extends BaseMVPActivity<ActivityUpdatePwdLayoutBinding, UpdatePasswordPresenter> implements UpdatePasswordContract.View, View.OnClickListener {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        StyleConfig.setTheme(this);
         super.onCreate(savedInstanceState);
         QMUIStatusBarHelper.setStatusBarLightMode(this);
     }
@@ -47,6 +53,16 @@ public class UpdatePasswordActivity extends BaseMVPActivity<ActivityUpdatePwdLay
 
     @Override
     protected void initView() {
+        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar,"修改密码");
+        String phoneNum = UserHelper.getUserPhone();
+        if (!TextUtils.isEmpty(phoneNum)) {
+            try{
+                String cPhone = phoneNum.substring(0, 3) + "****" + phoneNum.substring(7, phoneNum.length());
+                viewBinding.tvPhone.setText(cPhone);
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+        }
     }
 
     @Override
@@ -61,21 +77,36 @@ public class UpdatePasswordActivity extends BaseMVPActivity<ActivityUpdatePwdLay
     }
 
     @Override
-    public void onBindSuccess() {
-        ToastUtil.getInstance().showShort("设置成功");
-    }
-
-    @Override
-    public void queryModifyConfigSuccess(QueryParamsConfigBean bean) {
+    public void onClick(View v) {
+        int id = v.getId();
+        if (id == R.id.tv_confirm) {
+            String text = viewBinding.etPassword.getText().toString().trim();
+            if (TextUtils.isEmpty(text)) {
+                ToastUtil.getInstance().showShort("请输入账号原密码");
+                return;
+            }
+            presenter.checkOldPwd(text);
+            return;
+        }
+        if (id == R.id.tv_forget_pwd) {
+            ARouter.getInstance().build(RouterPath.UserCenter.FORGET_PASSWORD)
+                    .navigation();
+            return;
+        }
     }
 
     @Override
-    public void onClick(View v) {
+    protected UpdatePasswordPresenter createPresenter() {
+        return new UpdatePasswordPresenter();
     }
 
     @Override
-    protected BindPasswordPresenter createPresenter() {
-        return new BindPasswordPresenter();
+    public void checkPwdSuccess() {
+        if(!checkActivityExist()){
+            return;
+        }
+        ARouter.getInstance().build(RouterPath.UserCenter.MINE_MODIFY_PASSWORD)
+                .withString("phoneNum", UserHelper.getUserPhone())
+                .navigation();
     }
-
 }

usercenter/src/main/res/layout/ac_forget_pwd_layout.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:ignore="MissingDefaultResource">
+
+    <include
+        android:id="@+id/toolbar_include"
+        layout="@layout/common_toolbar_layout" />
+
+    <TextView
+        android:id="@+id/tv_phone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="12dp"
+        android:layout_marginTop="15dp"
+        android:text="--"
+        android:textColor="@color/black"
+        android:textSize="20sp" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:layout_marginStart="13dp"
+        android:layout_marginEnd="13dp"
+        android:background="@drawable/bg_white_10dp">
+
+
+        <EditText
+            android:textCursorDrawable="@drawable/shape_sign_out_edit_drawable"
+            android:theme="@style/MyEditText"
+            android:id="@+id/et_auth_code"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/dp_48"
+            android:background="@null"
+            android:gravity="center_vertical"
+            android:hint="请输入验证码"
+            android:inputType="number"
+            android:maxLength="6"
+            android:paddingLeft="14dp"
+            android:paddingRight="14dp"
+            android:textColor="@color/color_1a1a1a"
+            android:textColorHint="@color/color_aaaaaa"
+            android:textSize="@dimen/sp_16"
+            app:layout_constraintRight_toLeftOf="@+id/tv_get_auth_code"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_get_auth_code"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_48"
+            android:layout_marginRight="12dp"
+            android:gravity="center"
+            android:text="获取验证码"
+            android:textColor="?attr/klx_main_color2"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    <TextView
+        android:id="@+id/tv_confirm"
+        android:layout_width="match_parent"
+        android:layout_height="44dp"
+        android:layout_marginLeft="25dp"
+        android:layout_marginTop="30dp"
+        android:layout_marginRight="25dp"
+        android:layout_marginBottom="48dp"
+        android:background="?attr/klx_main_bt_background"
+        android:gravity="center"
+        android:text="确定"
+        android:textStyle="bold"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_18" />
+
+</LinearLayout>

usercenter/src/main/res/layout/ac_modify_password.xml

@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:ignore="MissingDefaultResource">
+
+    <include
+        android:id="@+id/toolbar_include"
+        layout="@layout/common_toolbar_layout" />
+
+    <TextView
+        android:id="@+id/tv_phone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="12dp"
+        android:layout_marginTop="15dp"
+        android:text="--"
+        android:textColor="@color/black"
+        android:textSize="20sp" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="13dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginEnd="13dp"
+        android:background="@drawable/bg_white_10dp">
+
+        <EditText
+            android:id="@+id/et_password"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_48"
+            android:background="@null"
+            android:gravity="center_vertical"
+            android:hint="请输入6-20位密码"
+            android:inputType="textPassword"
+            android:paddingLeft="14dp"
+            android:paddingRight="14dp"
+            android:textColor="@color/color_1a1a1a"
+            android:textColorHint="@color/color_aaaaaa"
+            android:textCursorDrawable="@drawable/shape_sign_out_edit_drawable"
+            android:textSize="@dimen/sp_16"
+            android:theme="@style/MyEditText"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <View
+            android:id="@+id/view_line"
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:layout_marginLeft="12dp"
+            android:background="@color/divide_color_f0f0f0"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/et_password" />
+
+        <EditText
+            android:id="@+id/et_password2"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_48"
+            android:background="@null"
+            android:gravity="center_vertical"
+            android:hint="请再次输入新密码"
+            android:inputType="textPassword"
+            android:paddingLeft="14dp"
+            android:paddingRight="14dp"
+            android:textColor="@color/color_1a1a1a"
+            android:textColorHint="@color/color_aaaaaa"
+            android:textCursorDrawable="@drawable/shape_sign_out_edit_drawable"
+            android:textSize="@dimen/sp_16"
+            android:theme="@style/MyEditText"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/view_line" />
+
+        <View
+            android:id="@+id/view_line2"
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:layout_marginLeft="12dp"
+            android:background="@color/divide_color_f0f0f0"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/et_password2" />
+
+
+        <EditText
+            android:id="@+id/et_auth_code"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_48"
+            android:background="@null"
+            android:gravity="center_vertical"
+            android:hint="请输入验证码"
+            android:inputType="number"
+            android:maxLength="6"
+            android:paddingLeft="14dp"
+            android:paddingRight="14dp"
+            android:textColor="@color/color_1a1a1a"
+            android:textColorHint="@color/color_aaaaaa"
+            android:textCursorDrawable="@drawable/shape_sign_out_edit_drawable"
+            android:textSize="@dimen/sp_16"
+            android:theme="@style/MyEditText"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/view_line2" />
+
+        <TextView
+            android:id="@+id/tv_get_auth_code"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_48"
+            android:layout_marginRight="12dp"
+            android:gravity="center"
+            android:text="获取验证码"
+            android:textColor="?attr/klx_main_color2"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="@+id/et_auth_code"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/et_auth_code" />
+
+        <androidx.constraintlayout.widget.Group
+            tools:visibility="gone"
+            android:id="@+id/group_code"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="et_auth_code,tv_get_auth_code,view_line2" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    <TextView
+        android:id="@+id/tv_confirm"
+        android:layout_width="match_parent"
+        android:layout_height="44dp"
+        android:layout_marginLeft="25dp"
+        android:layout_marginTop="30dp"
+        android:layout_marginRight="25dp"
+        android:layout_marginBottom="48dp"
+        android:background="?attr/klx_main_bt_background"
+        android:gravity="center"
+        android:text="确定"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_18"
+        android:textStyle="bold" />
+
+</LinearLayout>

usercenter/src/main/res/layout/activity_update_pwd_layout.xml

@@ -30,8 +30,9 @@
         android:background="@drawable/bg_white_10dp">
 
         <com.cooleshow.base.widgets.ClearEditText
+            android:includeFontPadding="false"
             android:theme="@style/MyEditText"
-            android:textCursorDrawable="@drawable/shape_2dc7aa_1dp"
+            android:textCursorDrawable="@drawable/shape_sign_out_edit_drawable"
             android:id="@+id/et_password"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_48"