商户App+企业app 密码方面的逻辑已完成

app/src/main/java/com/xx/merchanthbh/data/http/requst/SetPwdRequest.kt

+package com.xx.merchanthbh.data.http.requst
+
 import com.xx.merchanthbh.data.http.BaseRespons
 import io.reactivex.rxjava3.core.Observable
 import me.goldze.mvvmhabit.http.ApiParams
 import me.goldze.mvvmhabit.http.BaseResponse
 
+class SetPwdRequest : BaseRespons() {
+
 
-class SetPwdRequest: BaseRespons() {
     /**
      * 设置密码
      */

app/src/main/java/com/xx/merchanthbh/ui/login/LoginViewModel.java

@@ -15,6 +15,7 @@ import com.xx.merchanthbh.R;
 import com.xx.merchanthbh.data.http.requst.LoginRequest;
 import com.xx.merchanthbh.data.http.respons.UserInfoBean;
 import com.xx.merchanthbh.data.local.LocalData;
+import com.xx.merchanthbh.data.staticdata.StaticData;
 import com.xx.merchanthbh.ui.addproduct.AddProductActivity;
 import com.xx.merchanthbh.ui.home.HomeActivity;
 import com.xx.merchanthbh.ui.merchantenter.MerchantEnterActivity;
@@ -37,7 +38,7 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
     //密码的绑定
     public ObservableField<String> password = new ObservableField<>("");
 
-    public boolean isAgree=false;
+    public boolean isAgree = false;
 
     public LoginViewModel(@NonNull Application application, LoginRequest model) {
         super(application, model);
@@ -74,8 +75,7 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
     public BindingCommand login = new BindingCommand(new BindingAction() {
         @Override
         public void call() {
-            if (!isAgree)
-            {
+            if (!isAgree) {
                 ToastUtils.showShort("请阅读并同意协议");
                 return;
 
@@ -129,20 +129,22 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
                 }).subscribe(new ApiDisposableObserver<UserInfoBean>() {
                     @Override
                     public void onSuccess(UserInfoBean resultBean) {
-
+//                        判断是否是店长
+                        if (resultBean.getUser().getRoles().get(0).getRoleName().equals("店长")) {
+                            StaticData.personType = 0;
+                        }
                         //将用户信息存储到本地
                         LocalData.saveUser(resultBean.getUser());
                         dismissDialog();
-                       if (resultBean.getMerchant()==null)
-                        {
-                            Bundle bundle=new Bundle();
+                        if (resultBean.getMerchant() == null) {
+                            Bundle bundle = new Bundle();
                             bundle.putInt("pageStep", R.id.registerMaterialFragment);
-                            startActivity(MerchantEnterActivity.class,bundle);
-                        }else if (resultBean.getMerchant().getAuditStatus().equals("0")){
-                            Bundle bundle=new Bundle();
+                            startActivity(MerchantEnterActivity.class, bundle);
+                        } else if (resultBean.getMerchant().getAuditStatus().equals("0")) {
+                            Bundle bundle = new Bundle();
                             bundle.putInt("pageStep", R.id.merchantWaitFragment);
-                            startActivity(MerchantEnterActivity.class,bundle);
-                        }else {
+                            startActivity(MerchantEnterActivity.class, bundle);
+                        } else {
                             LocalData.saveMerchant(resultBean.getMerchant());
                             startActivity(HomeActivity.class);
                         }

app/src/main/java/com/xx/merchanthbh/ui/pwd/SetPwdActivity.java

@@ -3,14 +3,14 @@ package com.xx.merchanthbh.ui.pwd;
 
 import android.os.Bundle;
 
-import com.xx.hbhbcompany.BR;
-import com.xx.hbhbcompany.data.http.requst.SetPwdRequest;
+import com.xx.merchanthbh.BR;
 import com.xx.merchanthbh.R;
+import com.xx.merchanthbh.data.http.requst.SetPwdRequest;
 import com.xx.merchanthbh.databinding.ActivitySetPwdBinding;
 
 import me.goldze.mvvmhabit.base.BaseActivity;
 
-public class SetPwdActivity extends BaseActivity<ActivitySetPwdBinding, SetPwdViewModel> {
+public class SetPwdActivity extends BaseActivity<ActivitySetPwdBinding,SetPwdViewModel> {
     @Override
     public int initContentView(Bundle savedInstanceState) {
         return R.layout.activity_set_pwd;

app/src/main/java/com/xx/merchanthbh/ui/pwd/SetPwdViewModel.java

@@ -8,7 +8,7 @@ import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.databinding.ObservableField;
 
-import com.xx.hbhbcompany.data.http.requst.SetPwdRequest;
+import com.xx.merchanthbh.data.http.requst.SetPwdRequest;
 import com.xx.merchanthbh.ui.login.LoginActivity;
 
 import io.reactivex.rxjava3.disposables.Disposable;