68120 【商户app-android】诉求反馈，被驳回的诉求，在查看详情页面中需要在顶部增加一个驳回原因的信息，点击【查看】弹框显示驳回原因（参考IOS）

app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealEditActivity.java

@@ -19,6 +19,7 @@ import com.xx.xxviewlibrary.witget.model.FileBean;
 import java.util.ArrayList;
 
 import me.goldze.mvvmhabit.base.BaseActivity;
+import me.goldze.mvvmhabit.utils.StringUtils;
 
 public class AppealEditActivity extends BaseActivity<ActivityAppealEditBinding, AppealEditViewModel> {
     @Override
@@ -39,22 +40,20 @@ public class AppealEditActivity extends BaseActivity<ActivityAppealEditBinding,
         viewModel.getAppealDetailById(getIntent().getStringExtra("appealId"));
         // 调用ViewModel的方法来刷新昵称
         viewModel.refreshNickName();
-        Log.v("在activity获取的驳回原因",viewModel.remark);
         if (viewModel.remark != null) {
             binding.rejectReasonTip.setVisibility(View.VISIBLE);
             viewModel.showRejectionDialog.observe(this, show -> {
-                String rejectionReason=null;
-                rejectionReason = viewModel.remark;
+                String rejectionReason = StringUtils.isEmpty(viewModel.remark) ? "" : viewModel.remark;
                 RejectionDialog rejectionDialog = new RejectionDialog(this, rejectionReason);
                 rejectionDialog.show();
             });
-        }  else {
-        binding.rejectReasonTip.setVisibility(View.GONE);
-    }
+        } else {
+            binding.rejectReasonTip.setVisibility(View.GONE);
+        }
 
 
         /*上传图片*/
-        viewModel.appealPicsAdapter= new AddImgAdapter(this, new ArrayList(),5,true);
+        viewModel.appealPicsAdapter = new AddImgAdapter(this, new ArrayList(), 5, true);
         binding.rvAapProduct.setAdapter(viewModel.appealPicsAdapter);
         viewModel.appealPicsAdapter.setOnItemClick(new xxBaseRecyclerViewAdapter.OnItemClick<FileBean>() {
             @Override

app/src/main/java/com/xx/merchanthbh/ui/appeal/AppealEditViewModel.java

@@ -39,6 +39,7 @@ import me.goldze.mvvmhabit.binding.command.BindingAction;
 import me.goldze.mvvmhabit.binding.command.BindingCommand;
 import me.goldze.mvvmhabit.http.ApiDisposableObserver;
 import me.goldze.mvvmhabit.utils.RxUtils;
+import me.goldze.mvvmhabit.utils.StringUtils;
 
 public class AppealEditViewModel extends BaseViewModel<AppealRequest> {
     /*创建反馈类型数据字典实体对象*/
@@ -116,7 +117,6 @@ public class AppealEditViewModel extends BaseViewModel<AppealRequest> {
                         if (!resultBean.getOperations().isEmpty()) {
                             /*取操作日志最新的一条的remark*/
                             remark = resultBean.getOperations().get(resultBean.getOperations().size() - 1).getRemark();
-                            Log.v("remark上来的值",remark);
                         }
                         /*上传图片*/
                         appealPicsAdapter.mList.clear();
@@ -192,7 +192,7 @@ public class AppealEditViewModel extends BaseViewModel<AppealRequest> {
     /*查看原因的弹窗*/
     public void openReason(View view) {
         boolean deFlag = true;
-        RejectionBean rejectionBean = new RejectionBean(deFlag,remark);
+        RejectionBean rejectionBean = new RejectionBean(deFlag, StringUtils.isEmpty(remark) ? "" : remark);
         showRejectionDialog.postValue(rejectionBean);
     }    /*上传图片*/
     public void openPhoto(AddImgAdapter type, int position) {

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/pwd/SetPwdViewModel.java

@@ -9,6 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.databinding.ObservableField;
 
 import com.xx.hbhbcompany.data.http.requst.SetPwdRequest;
+import com.xx.hbhbcompany.ui.home.HomeActivity;
 import com.xx.hbhbcompany.ui.login.LoginActivity;
 
 import io.reactivex.rxjava3.disposables.Disposable;
@@ -68,7 +69,7 @@ public class SetPwdViewModel extends BaseViewModel<SetPwdRequest> {
                             public void onSuccess(String resultBean) {
                                 //是指token
                                 Interceptor_TOKEN = "Bearer " + resultBean;
-                                startActivity(LoginActivity.class);
+                                startActivity(HomeActivity.class);
                             }
 
                             @Override