消费者 我的页面

app/src/main/java/com/xx/merchanthbh/ui/home/HomeViewModel.java

@@ -219,7 +219,7 @@ public class HomeViewModel extends BaseViewModel<HomeRequest> {
                             }
 
                         } else {
-//                            ToastUtils.showShort("版本已是最新！");
+                            ToastUtils.showShort("版本已是最新！");
                         }
 
 

app/src/main/java/com/xx/merchanthbh/ui/huanbohai/HuanBoHaiViewModel.java

@@ -199,7 +199,7 @@ public class HuanBoHaiViewModel extends ListBaseViewModel<HuanBoHaiRequest> {
                             }
 
                         } else {
-//                            ToastUtils.showShort("版本已是最新！");
+                            ToastUtils.showShort("版本已是最新！");
                         }
 
 

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

@@ -62,12 +62,11 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
     /*权限*/
     RxPermissions rxPermissions;
     //用户名的绑定
-    public ObservableField<String> userName = new ObservableField<>("13500000005");
-
+    public ObservableField<String> userName = new ObservableField<>("");
     /*隐私条款字段*/
     public MutableLiveData<String> agreeContent = new MutableLiveData<>(null);
     //密码的绑定
-    public ObservableField<String> password = new ObservableField<>("1234567Abc");
+    public ObservableField<String> password = new ObservableField<>("");
     /*安装新版本*/
     public MutableLiveData<String> openInstall = new MutableLiveData<>("");
     public boolean isAgree = false;
@@ -154,7 +153,7 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
                         } else {
                             /*强制更新标识位变更--重置用户登录*/
                             StaticData.updateLogin = 1;
-//                            ToastUtils.showShort("版本已是最新！");
+                            ToastUtils.showShort("版本已是最新！");
                         }
 
 
@@ -329,7 +328,7 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
                                 } else {
                                     /*强制更新标识位变更--重置用户登录*/
                                     StaticData.updateLogin = 1;
-//                                    ToastUtils.showShort("版本已是最新！");
+                                    ToastUtils.showShort("版本已是最新！");
                                 }
 
 

app/src/main/java/com/xx/merchanthbh/ui/mine/MineViewModel.java

@@ -244,7 +244,7 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
                             }
 
                         } else {
-//                            ToastUtils.showShort("版本已是最新！");
+                            ToastUtils.showShort("版本已是最新！");
                         }
 
 

consumer/src/main/java/com/xx/hbhconsumer/ui/login/LoginViewModel.java

@@ -340,7 +340,7 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
                         } else {
                             /*强制更新标识位变更--重置用户登录*/
                             StaticData.updateLogin = 1;
-//                            ToastUtils.showShort("版本已是最新！");
+                            ToastUtils.showShort("版本已是最新！");
                         }
 
 

consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineFragment.java

@@ -23,6 +23,7 @@ import com.xx.hbhconsumer.utils.RetrofitClient;
 
 import me.goldze.mvvmhabit.base.BaseFragment;
 import me.goldze.mvvmhabit.utils.StringUtils;
+import me.goldze.mvvmhabit.utils.ToastUtils;
 import me.jessyan.autosize.utils.AutoSizeUtils;
 
 public class MineFragment extends BaseFragment<FragmentMineBinding, MineViewModel> {
@@ -40,8 +41,6 @@ public class MineFragment extends BaseFragment<FragmentMineBinding, MineViewMode
     @Override
     public void onResume() {
         super.onResume();
-
-
     }
     @Override
     public int initVariableId() {

consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java

@@ -271,14 +271,21 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
                 }).subscribe(new ApiDisposableObserver<MemberInfoBean>() {
                     @Override
                     public void onSuccess(MemberInfoBean resultBean) {
-                        Log.v("头像头像", resultBean.getMemberPicture());
                         /*头像赋值*/
-                        avatarImageUrl.setValue(resultBean.getMemberPicture());
+                        String memberPicture = resultBean.getMemberPicture();
+                        if (memberPicture != null && !memberPicture.isEmpty()) {
+                            Log.v("头像头像", resultBean.getMemberPicture());
+                            avatarImageUrl.setValue(memberPicture);
+                        } else {
+                            memberPicture="";
+                            avatarImageUrl.setValue(memberPicture);
+                        }
                         integralTotal.postValue(resultBean.getUsableIntegral());
                         memberCoupon.postValue(resultBean.getMemberCoupon());
                         memberName.postValue(resultBean.getGradeName());
                     }
 
+
                     @Override
                     public void onError(String Error) {
                         dismissDialog();

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/home/HomeViewModel.java

@@ -178,7 +178,7 @@ public class HomeViewModel extends ListBaseViewModel<HomeRequest> {
                             }
 
                         } else {
-//                            ToastUtils.showShort("版本已是最新！");
+                            ToastUtils.showShort("版本已是最新！");
                         }
                     }
 

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/login/LoginViewModel.java

@@ -155,7 +155,7 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
 
                             /*强制更新标识位变更--重置用户登录*/
                             StaticData.updateLogin = 1;
-//                            ToastUtils.showShort("版本已是最新！");
+                            ToastUtils.showShort("版本已是最新！");
                         }
 
 
@@ -307,7 +307,7 @@ public class LoginViewModel extends BaseViewModel<LoginRequest> {
                                 } else {
                                     /*强制更新标识位变更--重置用户登录*/
                                     StaticData.updateLogin = 1;
-//                                    ToastUtils.showShort("版本已是最新！");
+                                    ToastUtils.showShort("版本已是最新！");
                                 }
 
 

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/mine/MineViewModel.java

@@ -229,7 +229,7 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
                             }
 
                         } else {
-//                            ToastUtils.showShort("版本已是最新！");
+                            ToastUtils.showShort("版本已是最新！");
                         }
                     }
 

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/work/WorkViewModel.java

@@ -139,7 +139,7 @@ public class WorkViewModel extends BaseViewModel<WorkRequest> {
                             }
 
                         } else {
-//                            ToastUtils.showShort("版本已是最新！");
+                            ToastUtils.showShort("版本已是最新！");
                         }
                     }