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

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

@@ -3,6 +3,7 @@ package com.xx.merchanthbh.ui.appeal;
 import static me.goldze.mvvmhabit.utils.Utils.getContext;
 
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 
 import com.xx.merchanthbh.BR;
@@ -38,12 +39,18 @@ public class AppealEditActivity extends BaseActivity<ActivityAppealEditBinding,
         viewModel.getAppealDetailById(getIntent().getStringExtra("appealId"));
         // 调用ViewModel的方法来刷新昵称
         viewModel.refreshNickName();
-
-        viewModel.showRejectionDialog.observe(this, show -> {
-            String rejectionReason = viewModel.remark != null ? viewModel.remark : "";
-            RejectionDialog rejectionDialog = new RejectionDialog(this,rejectionReason);
-            rejectionDialog.show();
-        });
+        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;
+                RejectionDialog rejectionDialog = new RejectionDialog(this, rejectionReason);
+                rejectionDialog.show();
+            });
+        }  else {
+        binding.rejectReasonTip.setVisibility(View.GONE);
+    }
 
 
         /*上传图片*/

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

@@ -116,6 +116,7 @@ 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();
@@ -191,10 +192,9 @@ public class AppealEditViewModel extends BaseViewModel<AppealRequest> {
     /*查看原因的弹窗*/
     public void openReason(View view) {
         boolean deFlag = true;
-        RejectionBean rejectionBean = new RejectionBean(deFlag,remark == null ? "" : remark);
+        RejectionBean rejectionBean = new RejectionBean(deFlag,remark);
         showRejectionDialog.postValue(rejectionBean);
-    }
-    /*上传图片*/
+    }    /*上传图片*/
     public void openPhoto(AddImgAdapter type, int position) {
         int max = 1;
         if (TextUtils.isEmpty(appealPicsAdapter.mList.get(position).getId())) {

app/src/main/res/layout/activity_appeal_edit.xml

@@ -43,8 +43,10 @@
                 android:layout_height="match_parent"
                 android:layout_margin="17dp"
                 android:orientation="vertical">
-                <!--修改密码模块-->
+                <!--驳回原因-->
                 <LinearLayout
+                    android:visibility="gone"
+                    android:id="@+id/reject_reason_tip"
                     android:layout_width="match_parent"
                     android:layout_height="70dp"
                     android:layout_marginBottom="13dp"