增加注册时候设置昵称流程

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

@@ -83,7 +83,7 @@ interface UserApi {
    */
     @FormUrlEncoded
     @POST(BaseConstant.AUTH_GROUP + "user/setUsernameAndPassword")
-    fun bindPassword(@Field("password") password: String): Observable<BaseResponse<Object>>
+    fun bindPassword(@Field("password") password: String,@Field("username") username: String): Observable<BaseResponse<Object>>
 /*
         忘记密码
 //     */

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

@@ -16,11 +16,11 @@ import com.cooleshow.usercenter.presenter.contract.BindPasswordContract;
 public class BindPasswordPresenter extends BasePresenter<BindPasswordContract.BindPwdView> implements BindPasswordContract.Presenter {
 
     @Override
-    public void onBindPwd(String pwd) {
+    public void onBindPwd(String pwd,String nickName) {
         if (getView() != null) {
             getView().showLoading();
         }
-        addSubscribe(create(UserApi.class).bindPassword(pwd), new BaseObserver<Object>(getView()) {
+        addSubscribe(create(UserApi.class).bindPassword(pwd,nickName), new BaseObserver<Object>(getView()) {
             @Override
             protected void onSuccess(Object data) {
                 if (getView() != null) {

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

@@ -12,6 +12,6 @@ public interface BindPasswordContract {
     }
 
     interface Presenter {
-        void onBindPwd(String pwd);
+        void onBindPwd(String pwd,String nickName);
     }
 }

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/BindPasswordActivity.java

@@ -2,9 +2,11 @@ package com.cooleshow.usercenter.ui.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
+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.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ToastUtil;
@@ -25,7 +27,6 @@ import androidx.annotation.Nullable;
  */
 @Route(path = RouterPath.UserCenter.PATH_BIND_PASSWORD)
 public class BindPasswordActivity extends BaseMVPActivity<ActivityBindPwdLayoutBinding, BindPasswordPresenter> implements BindPasswordContract.BindPwdView, View.OnClickListener {
-
     private String tempToken;
 
     @Override
@@ -51,10 +52,7 @@ public class BindPasswordActivity extends BaseMVPActivity<ActivityBindPwdLayoutB
     @Override
     public void onBindSuccess() {
         ToastUtil.getInstance().showShort("设置成功");
-        Intent intent = new Intent();
-        intent.putExtra(UserConstants.TEMP_TOKEN, tempToken);
-        setResult(RESULT_OK, intent);
-        finish();
+        reBackLogin();
     }
 
     @Override
@@ -62,13 +60,26 @@ public class BindPasswordActivity extends BaseMVPActivity<ActivityBindPwdLayoutB
         if (v.getId() == R.id.tv_confirm) {
             String pwd = viewBinding.etPwd.getText().toString();
             String pwdAgain = viewBinding.etPwdAgain.getText().toString();
+            String nickName = viewBinding.etNickname.getText().toString();
+            if (TextUtils.isEmpty(nickName)) {
+                ToastUtil.getInstance().showShort("请输入昵称！");
+                return;
+            }
             if (PhoneCheckHelper.checkPwdValidity(pwd, pwdAgain)) {
-                presenter.onBindPwd(pwdAgain);
+                presenter.onBindPwd(pwdAgain,nickName);
             }
             return;
         }
     }
 
+    private void reBackLogin() {
+        Intent intent = new Intent();
+        intent.putExtra(UserConstants.TEMP_TOKEN, tempToken);
+        setResult(RESULT_OK, intent);
+        finish();
+
+    }
+
     @Override
     protected BindPasswordPresenter createPresenter() {
         return new BindPasswordPresenter();

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

@@ -27,20 +27,58 @@
         android:textStyle="bold"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+    <TextView
+        android:id="@+id/tv_set_nickname"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="35dp"
+        android:layout_marginTop="71dp"
+        android:includeFontPadding="false"
+        android:text="设置昵称"
+        android:textColor="@color/black"
+        android:textSize="@dimen/sp_18"
+        android:textStyle="bold"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_header_title" />
+
 
+    <EditText
+        android:id="@+id/et_nickname"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/common_line_height"
+        android:layout_marginStart="35dp"
+        android:layout_marginEnd="35dp"
+        android:background="@null"
+        android:hint="请输入昵称"
+        android:inputType="text"
+        android:textColorHint="@color/color_ffc1c1c1"
+        android:textSize="@dimen/sp_16"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_set_nickname" />
+
+    <View
+        android:id="@+id/view_nickname_divide"
+        android:layout_width="0dp"
+        android:layout_height="1px"
+        android:layout_marginTop="3dp"
+        android:background="@color/divide_color"
+        app:layout_constraintLeft_toLeftOf="@+id/et_nickname"
+        app:layout_constraintRight_toRightOf="@+id/et_nickname"
+        app:layout_constraintTop_toBottomOf="@+id/et_nickname" />
     <TextView
+        android:layout_marginTop="16dp"
         android:id="@+id/tv_phone_num"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="35dp"
-        android:layout_marginTop="71dp"
         android:includeFontPadding="false"
         android:text="@string/please_input_pwd_str_title"
         android:textColor="@color/black"
         android:textSize="@dimen/sp_18"
         android:textStyle="bold"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_header_title" />
+        app:layout_constraintTop_toBottomOf="@+id/et_nickname" />
 
 
     <EditText