事件流程改变以及上传图片接口改变

app/src/main/java/com/sjkj/appthreefloor_tsgz/activity/DisposalResultsActivity.java

@@ -8,7 +8,6 @@ import android.os.AsyncTask;
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 
 import androidx.annotation.Nullable;
@@ -23,19 +22,23 @@ import com.gyf.immersionbar.ImmersionBar;
 import com.hjq.permissions.OnPermissionCallback;
 import com.hjq.permissions.Permission;
 import com.hjq.permissions.XXPermissions;
+import com.kongzue.dialogx.dialogs.MessageDialog;
+import com.kongzue.dialogx.interfaces.OnDialogButtonClickListener;
 import com.sjkj.appthreefloor_tsgz.R;
 import com.sjkj.appthreefloor_tsgz.activity.viewModel.DisposalResultsViewModel;
 import com.sjkj.appthreefloor_tsgz.adapter.ImageAdapter;
 import com.sjkj.appthreefloor_tsgz.adapter.VideoDelAdapter;
 import com.sjkj.appthreefloor_tsgz.app.App;
-import com.sjkj.appthreefloor_tsgz.bean.FileBean;
 import com.sjkj.appthreefloor_tsgz.bean.ImageBean;
+import com.sjkj.appthreefloor_tsgz.bean.ImageEventFilesBean;
 import com.sjkj.appthreefloor_tsgz.databinding.ActivityDisposalResultsBinding;
+import com.sjkj.appthreefloor_tsgz.net.EventChooseStatusRequest;
 import com.sjkj.appthreefloor_tsgz.net.UploadFileRequest;
 import com.sjkj.appthreefloor_tsgz.utils.SlideItemTouchHelper;
 import com.sjkj.appthreefloor_tsgz.weight.photoview.PhotoViewActivity;
 import com.sjkj.base_lib.adapter.BaseRecAdapter;
 import com.sjkj.base_lib.app.AppManager;
+import com.sjkj.base_lib.entity.Params;
 import com.sjkj.base_lib.net.domain.interactor.ProcessErrorSubscriber;
 import com.sjkj.base_lib.net.utils.RealPathFromUriUtils;
 import com.sjkj.base_lib.utils.AppTools;
@@ -72,7 +75,7 @@ public class DisposalResultsActivity extends BaseActivity {
     private List<ImageBean> imageBeans_image = new ArrayList<>();
     private List<ImageBean> imageBeans_video = new ArrayList<>();
     private UploadFileRequest uploadFileRequest = new UploadFileRequest(App.getInstance());
-
+    EventChooseStatusRequest chooseStatusRequest = new EventChooseStatusRequest(App.getInstance());
     @Override
     public void initBinding() {
         binding = (ActivityDisposalResultsBinding) getViewDataBinding();
@@ -91,11 +94,66 @@ public class DisposalResultsActivity extends BaseActivity {
                     ToastUtils.show("请上传图片");
                     return;
                 }
+
+                if (adapter.getList() != null && adapter.getList().size() > 0) {
+                    imageBeans.addAll(adapter.getList());
+
+                }
+                if (video_adapter.getList() != null && video_adapter.getList().size() > 0) {
+                    imageBeans.addAll(video_adapter.getList());
+
+                }
+                ChangeStatus();
             }
         });
 
     }
 
+    private void ChangeStatus() {
+        MessageDialog.show("温馨提示", "是否确定申请办结?", "确定", "取消")
+                .setCancelButton(new OnDialogButtonClickListener<MessageDialog>() {
+                    @Override
+                    public boolean onClick(MessageDialog baseDialog, View v) {
+                        baseDialog.dismiss();
+                        return false;
+                    }
+                })
+                .setOkButton(new OnDialogButtonClickListener<MessageDialog>() {
+                    @Override
+                    public boolean onClick(MessageDialog baseDialog, View v) {
+                        showLoadingDialog();
+                        Params params = new Params();
+                        params.put("eventId", getIntent().getStringExtra("id"));
+                        params.put("status", "40");
+                        params.put("eventFiles", imageBeans);
+                        chooseStatusRequest.setParams(params);
+                        chooseStatusRequest.execute(new ProcessErrorSubscriber() {
+                            @Override
+                            public void onError(Throwable e) {
+                                super.onError(e);
+                                hideLoadingDialog(LoadingDialog.LOADING_FAILED);
+                                if (e != null) {
+                                    ToastUtils.show(e.getMessage());
+                                }
+                            }
+
+                            @Override
+                            public void onNext(Object o) {
+                                super.onNext(o);
+                                hideLoadingDialog(LoadingDialog.LOADING_SUCCESS);
+                                ToastUtils.show("操作成功");
+                                setResult(1000);
+                                finish();
+                            }
+                        });
+
+                        return false;
+                    }
+                });
+
+
+    }
+
     public void chooseVideo() {
         XXPermissions.with(AppManager.getAppManager().currentActivity())
                 // .permission(Permission.WRITE_EXTERNAL_STORAGE)
@@ -172,6 +230,9 @@ public class DisposalResultsActivity extends BaseActivity {
     public void initView() {
         super.initView();
         getTitleView().setText("处置结果");
+        imageBeans.clear();
+        imageBeans_image.clear();
+        imageBeans_video.clear();
         ImmersionBar.with(DisposalResultsActivity.this)
                 .statusBarDarkFont(true, 0.2f)
                 .statusBarColor(R.color.white)
@@ -228,7 +289,6 @@ public class DisposalResultsActivity extends BaseActivity {
 
                 // startActivity(OpenFileUtil.openFile(NewEventActivity.this, mCurrentPhotoPath));
                 Intent intent = new Intent(DisposalResultsActivity.this, MyVideoPlayerActivity.class);
-                Log.d("zhr123123", bean.getPath());
                 intent.putExtra("videoUrl", bean.getPath());
                 startActivity(intent);
             }
@@ -287,7 +347,7 @@ public class DisposalResultsActivity extends BaseActivity {
                         public void onSuccess(File file) {
                             //TODO 压缩成功后调用，返回压缩后的图片文件
                             uploadFileRequest.setFile(file);
-                            uploadFileRequest.execute(new ProcessErrorSubscriber<FileBean>() {
+                            uploadFileRequest.execute(new ProcessErrorSubscriber<ImageEventFilesBean>() {
                                 @Override
                                 public void onError(Throwable e) {
                                     super.onError(e);
@@ -296,13 +356,16 @@ public class DisposalResultsActivity extends BaseActivity {
                                 }
 
                                 @Override
-                                public void onNext(FileBean bean) {
+                                public void onNext(ImageEventFilesBean bean) {
                                     super.onNext(bean);
                                     hideLoadingDialog(LoadingDialog.LOADING_SUCCESS);
                                     ImageBean imageBean = new ImageBean();
                                     imageBean.setRealUrl(AppTools.getImageBaseUrl() + bean.getFileUrl());
-                                    imageBean.setFileNname(bean.getFileName());
-                                    imageBeans.add(imageBean);
+                                    imageBean.setFileUrl(bean.getFileUrl());
+                                    imageBean.setFileName(bean.getFileName());
+                                    imageBean.setFileSize(bean.getFileSize());
+                                    imageBean.setFileType(bean.getFileType());
+                                    imageBean.setType(TYPE_IMAGE);
                                     imageBeans_image.add(imageBean);
                                     adapter.refreshList(imageBeans_image);
                                 }
@@ -378,10 +441,8 @@ public class DisposalResultsActivity extends BaseActivity {
 
             File imageFile = new File(compressedFilePath);
 
-            Log.d("zhr123123", compressedFilePath);
-            Log.d("zhr123123fff", imageFile.getAbsolutePath());
             uploadFileRequest.setFile(imageFile);
-            uploadFileRequest.execute(new ProcessErrorSubscriber<FileBean>() {
+            uploadFileRequest.execute(new ProcessErrorSubscriber<ImageEventFilesBean>() {
                 @Override
                 public void onError(Throwable e) {
                     super.onError(e);
@@ -390,15 +451,18 @@ public class DisposalResultsActivity extends BaseActivity {
                 }
 
                 @Override
-                public void onNext(FileBean bean) {
+                public void onNext(ImageEventFilesBean bean) {
                     super.onNext(bean);
                     //ToastUtils.show("上传成功" + bean.getWebUrl() + "-=-=");
                     hideLoadingDialog(LoadingDialog.LOADING_SUCCESS);
                     ImageBean imageBean = new ImageBean();
                     imageBean.setRealUrl(AppTools.getImageBaseUrl() + bean.getFileUrl());
-                    imageBean.setFileNname(bean.getFileName());
+                    imageBean.setFileUrl(bean.getFileUrl());
+                    imageBean.setFileName(bean.getFileName());
+                    imageBean.setFileSize(bean.getFileSize());
+                    imageBean.setFileType(bean.getFileType());
                     imageBean.setPath(imageFile.getAbsolutePath());
-                    imageBeans.add(imageBean);
+                    imageBean.setType(TYPE_VIDEO);
                     imageBeans_video.add(imageBean);
                     video_adapter.refreshList(imageBeans_video);
 

app/src/main/java/com/sjkj/appthreefloor_tsgz/activity/ExoPlayerActivity.java

@@ -2,7 +2,6 @@ package com.sjkj.appthreefloor_tsgz.activity;
 
 import android.content.pm.ActivityInfo;
 import android.net.Uri;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager;
@@ -98,24 +97,24 @@ public class ExoPlayerActivity extends BaseActivity {
 
         List<String> list = Arrays.asList(getIntent().getStringExtra("id").split(","));
         getUrl(list.get(0));
-        for (int i = 0; i < list.size(); i++) {
-            final int index = i;
-            View view = LayoutInflater.from(ExoPlayerActivity.this).inflate(R.layout.view_exopayer_point, null);
-            TextView tv_title = view.findViewById(R.id.tv_title);
-            tv_title.setText(i + 1 + "");
-            tv_title.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    Log.d("zhr1231", list.get(index));
-                    if (player != null) {
-                        player.release();
-                        Log.d("zhr111release","release");
-                        player = null;
+        if (list.size() > 1) {
+            for (int i = 0; i < list.size(); i++) {
+                final int index = i;
+                View view = LayoutInflater.from(ExoPlayerActivity.this).inflate(R.layout.view_exopayer_point, null);
+                TextView tv_title = view.findViewById(R.id.tv_title);
+                tv_title.setText(i + 1 + "");
+                tv_title.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        if (player != null) {
+                            player.release();
+                            player = null;
+                        }
+                        getUrl(list.get(index));
                     }
-                    getUrl(list.get(index));
-                }
-            });
-            binding.ll.addView(view);
+                });
+                binding.ll.addView(view);
+            }
 
         }
 

app/src/main/java/com/sjkj/appthreefloor_tsgz/adapter/EventDetailsAdapter.java

@@ -10,13 +10,13 @@ import com.sjkj.base_lib.adapter.BaseRecAdapter;
 
 import java.util.List;
 
-public class EventDetailsAdapter extends BaseRecAdapter<EventDetailsBean.DeptsBean, ItemDetailsListBinding> {
+public class EventDetailsAdapter extends BaseRecAdapter<EventDetailsBean.DeptXz, ItemDetailsListBinding> {
 
     public EventDetailsAdapter(Context context) {
         super(context);
     }
 
-    public EventDetailsAdapter(Context context, List<EventDetailsBean.DeptsBean> list) {
+    public EventDetailsAdapter(Context context, List<EventDetailsBean.DeptXz> list) {
         super(context, list);
     }
 
@@ -26,7 +26,7 @@ public class EventDetailsAdapter extends BaseRecAdapter<EventDetailsBean.DeptsBe
     }
 
     @Override
-    protected void onBindItem(ItemDetailsListBinding binding, EventDetailsBean.DeptsBean bean, int position) {
+    protected void onBindItem(ItemDetailsListBinding binding, EventDetailsBean.DeptXz bean, int position) {
         binding.setModel(bean);
         binding.executePendingBindings();
         if (position % 2 == 0) {
@@ -34,30 +34,34 @@ public class EventDetailsAdapter extends BaseRecAdapter<EventDetailsBean.DeptsBe
         } else {
             binding.llTitleBackground.setBackgroundColor(Color.parseColor("#F7F7F7"));
         }
-        if (bean.getStatus().equals("10")) {
-            //待确认
-            binding.tvStatus.setTextColor(Color.parseColor("#767676"));
-            binding.tvStatus.setText("待确认");
-        } else if (bean.getStatus().equals("20")) {
-            //待签收
-            binding.tvStatus.setTextColor(Color.parseColor("#04BF60"));
-            binding.tvStatus.setText("待签收");
-        } else if (bean.getStatus().equals("30")) {
-            //处理中
-            binding.tvStatus.setText("处理中");
-            binding.tvStatus.setTextColor(Color.parseColor("#409EFF"));
-        } else if (bean.getStatus().equals("40")) {
-            //办结
-            binding.tvStatus.setText("办结");
-            binding.tvStatus.setTextColor(Color.parseColor("#FF6A00"));
-        } else if (bean.getStatus().equals("50")) {
-            //归档
-            binding.tvStatus.setText("归档");
-            binding.tvStatus.setTextColor(Color.parseColor("#5D5DFF"));
-        } else if (bean.getStatus().equals("0")) {
-            //死档
-            binding.tvStatus.setText("无需处理");
-            binding.tvStatus.setTextColor(Color.parseColor("#366CFF"));
+        if (bean.getDeptType().equals("dept_type_1")) {
+            binding.tvStatus.setText(bean.getStatusValue());
+            if (bean.getStatus().equals("10")) {
+                //待确认
+                binding.tvStatus.setTextColor(Color.parseColor("#767676"));
+
+            } else if (bean.getStatus().equals("20")) {
+                //待签收
+                binding.tvStatus.setTextColor(Color.parseColor("#04BF60"));
+            } else if (bean.getStatus().equals("30")) {
+                //处理中
+                binding.tvStatus.setTextColor(Color.parseColor("#409EFF"));
+            } else if (bean.getStatus().equals("40")) {
+                //办结
+                binding.tvStatus.setTextColor(Color.parseColor("#FF6A00"));
+            } else if (bean.getStatus().equals("50")) {
+                //归档
+                binding.tvStatus.setTextColor(Color.parseColor("#5D5DFF"));
+            } else if (bean.getStatus().equals("0")) {
+                //死档
+                binding.tvStatus.setTextColor(Color.parseColor("#366CFF"));
+            }
+        } else {
+            if (bean.getDeptType().equals("dept_type_2") && bean.getStatus().equals("60")) {
+                binding.tvStatus.setText(bean.getStatusValue());
+                binding.tvStatus.setTextColor(Color.parseColor("#FD6350"));
+
+            }
         }
 
     }

app/src/main/java/com/sjkj/appthreefloor_tsgz/adapter/MessageDetailsAdapter.java

@@ -121,7 +121,6 @@ public class MessageDetailsAdapter extends BaseRecAdapter<EventMessageDetailsBea
                 if (ImageUtils.isImage(list.get(i))) {
                     ImageBean imageBean = new ImageBean();
                     imageBean.setRealUrl(AppTools.getImageBaseUrl() + list.get(i));
-                    Log.d("zhr1111", imageBean.getRealUrl());
                     imageBeanList.add(imageBean);
                 } else if (VideoUtils.isVideoFile(list.get(i))) {
                     ImageBean imageBean = new ImageBean();

app/src/main/java/com/sjkj/appthreefloor_tsgz/bean/EventCenterListBean.java

@@ -16,27 +16,6 @@ public class EventCenterListBean {
 
     public class EventCenterList {
         private String id;
-        private String eventJson;
-
-        public String getId() {
-            return id;
-        }
-
-        public void setId(String id) {
-            this.id = id;
-        }
-
-        public String getEventJson() {
-            return eventJson;
-        }
-
-        public void setEventJson(String eventJson) {
-            this.eventJson = eventJson;
-        }
-    }
-
-    public class EventCenter {
-        private String id;
         private String remark;
 
         public String getId() {
@@ -166,4 +145,6 @@ public class EventCenterListBean {
     }
 
 
+
+
 }

app/src/main/java/com/sjkj/appthreefloor_tsgz/bean/EventDetailsBean.java

@@ -1,7 +1,6 @@
 package com.sjkj.appthreefloor_tsgz.bean;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * EventDetailsBean class
@@ -11,7 +10,7 @@ public class EventDetailsBean {
 
     private Object createBy;
 
-    private Object createName;
+    private String createName;
 
     private String createTime;
 
@@ -27,6 +26,15 @@ public class EventDetailsBean {
 
     private String eventName;
 
+    public int[] getPerms() {
+        return perms;
+    }
+
+    public void setPerms(int[] perms) {
+        this.perms = perms;
+    }
+
+    private int[] perms;
     private String eventType;
 
     private Object eventTypeName;
@@ -45,14 +53,14 @@ public class EventDetailsBean {
 
     private String url;
 
-    private List<DeptsBean> depts;
+    private DeptedBean depted;
 
-    public List<DeptsBean> getDepts() {
-        return depts;
+    public DeptedBean getDepted() {
+        return depted;
     }
 
-    public void setDepts(List<DeptsBean> depts) {
-        this.depts = depts;
+    public void setDepted(DeptedBean depted) {
+        this.depted = depted;
     }
 
     public Object getCreateBy() {
@@ -63,11 +71,11 @@ public class EventDetailsBean {
         this.createBy = createBy;
     }
 
-    public Object getCreateName() {
+    public String getCreateName() {
         return createName;
     }
 
-    public void setCreateName(Object createName) {
+    public void setCreateName(String createName) {
         this.createName = createName;
     }
 
@@ -200,16 +208,68 @@ public class EventDetailsBean {
     }
 
 
-    public class DeptsBean{
-        private String createTime;
+    public class DeptedBean {
+
+        private List<DeptXz> deptXz;
+
+        public List<DeptXz> getDeptXz() {
+            return deptXz;
+        }
+
+        public void setDeptXz(List<DeptXz> deptXz) {
+            this.deptXz = deptXz;
+        }
+
+        public List<DeptXz> getDeptHg() {
+            return deptHg;
+        }
+
+        public void setDeptHg(List<DeptXz> deptHg) {
+            this.deptHg = deptHg;
+        }
+
+        private List<DeptXz> deptHg;
+
+
+    }
+
+    public static class DeptXz {
+        public String getUpdateTime() {
+            return updateTime;
+        }
+
+        public void setUpdateTime(String updateTime) {
+            this.updateTime = updateTime;
+        }
+
+        private String updateTime;
         private String deptName;
+        private String deptId;
+        private String deptType;
+        private String statusValue;
+
+        public String getStatusValue() {
+            return statusValue;
+        }
+
+        public void setStatusValue(String statusValue) {
+            this.statusValue = statusValue;
+        }
+
+        public String getDeptId() {
+            return deptId;
+        }
+
+        public void setDeptId(String deptId) {
+            this.deptId = deptId;
+        }
 
-        public String getCreateTime() {
-            return createTime;
+        public String getDeptType() {
+            return deptType;
         }
 
-        public void setCreateTime(String createTime) {
-            this.createTime = createTime;
+        public void setDeptType(String deptType) {
+            this.deptType = deptType;
         }
 
         public String getDeptName() {

app/src/main/java/com/sjkj/appthreefloor_tsgz/bean/ImageBean.java

@@ -10,8 +10,45 @@ public class ImageBean implements Serializable {
     private String realUrl;
     private Uri uri;
     private int type;
+    private String fileName;
+    private String fileSize;
 
 
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getFileSize() {
+        return fileSize;
+    }
+
+    public void setFileSize(String fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    public String getFileType() {
+        return fileType;
+    }
+
+    public void setFileType(String fileType) {
+        this.fileType = fileType;
+    }
+
+    public String getFileUrl() {
+        return fileUrl;
+    }
+
+    public void setFileUrl(String fileUrl) {
+        this.fileUrl = fileUrl;
+    }
+
+    private String fileType;
+    private String fileUrl;
+
     public int getType() {
         return type;
     }

app/src/main/java/com/sjkj/appthreefloor_tsgz/bean/ImageEventFilesBean.java

@@ -0,0 +1,56 @@
+package com.sjkj.appthreefloor_tsgz.bean;
+
+import android.net.Uri;
+
+import java.io.Serializable;
+
+public class ImageEventFilesBean implements Serializable {
+    private String fileName;
+    private String fileSize;
+    private int type;
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getFileSize() {
+        return fileSize;
+    }
+
+    public void setFileSize(String fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    public String getFileType() {
+        return fileType;
+    }
+
+    public void setFileType(String fileType) {
+        this.fileType = fileType;
+    }
+
+    public String getFileUrl() {
+        return fileUrl;
+    }
+
+    public void setFileUrl(String fileUrl) {
+        this.fileUrl = fileUrl;
+    }
+
+    private String fileType;
+    private String fileUrl;
+
+
+}

app/src/main/java/com/sjkj/appthreefloor_tsgz/fragment/EventDetailsFragment.java

@@ -2,11 +2,13 @@ package com.sjkj.appthreefloor_tsgz.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.Nullable;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -17,12 +19,14 @@ import com.sjkj.appthreefloor_tsgz.R;
 import com.sjkj.appthreefloor_tsgz.activity.DisposalResultsActivity;
 import com.sjkj.appthreefloor_tsgz.adapter.EventDetailsAdapter;
 import com.sjkj.appthreefloor_tsgz.app.App;
+import com.sjkj.appthreefloor_tsgz.bean.CameraTypeBean;
 import com.sjkj.appthreefloor_tsgz.bean.EventDetailsBean;
 import com.sjkj.appthreefloor_tsgz.bean.MessageEvent;
 import com.sjkj.appthreefloor_tsgz.databinding.FragmentEventDetailsBinding;
 import com.sjkj.appthreefloor_tsgz.fragment.viewModel.EventFargmentViewModel;
 import com.sjkj.appthreefloor_tsgz.net.EventChooseStatusRequest;
 import com.sjkj.appthreefloor_tsgz.net.EventDetailsRequest;
+import com.sjkj.appthreefloor_tsgz.net.GetDictTypeRequest;
 import com.sjkj.base_lib.entity.Params;
 import com.sjkj.base_lib.net.domain.interactor.ProcessErrorSubscriber;
 import com.sjkj.base_lib.utils.LocationUtils;
@@ -30,12 +34,19 @@ import com.sjkj.base_lib.utils.ToastUtils;
 import com.sjkj.base_lib.view.BaseFragment;
 import com.sjkj.base_lib.weight.LoadingDialog;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 public class EventDetailsFragment extends BaseFragment {
     private FragmentEventDetailsBinding binding;
     private EventFargmentViewModel viewModel;
     private EventDetailsAdapter adapter;
     EventDetailsRequest eventDetailsRequest = new EventDetailsRequest(App.getInstance());
+    public GetDictTypeRequest getDictTypeRequest = new GetDictTypeRequest(App.getInstance());
     EventChooseStatusRequest chooseStatusRequest = new EventChooseStatusRequest(App.getInstance());
+    private List<CameraTypeBean> eventStatusList = new ArrayList<>();
+    private List<EventDetailsBean.DeptXz> deptXzList = new ArrayList<>();
 
     @Override
     protected int initLayout() {
@@ -65,6 +76,14 @@ public class EventDetailsFragment extends BaseFragment {
 
     @Override
     public void initListener() {
+        binding.tvNoNeed.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                //无需处理
+                ChangeStatus("0", binding.tvNoNeed.getText().toString());
+
+            }
+        });
 
         binding.tvCompleted.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -75,14 +94,14 @@ public class EventDetailsFragment extends BaseFragment {
         binding.tvFinish.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                // ChangeStatus("50", binding.tvFinish.getText().toString());
-                startActivity(new Intent(getActivity(), DisposalResultsActivity.class));
+                // ChangeStatus("40", binding.tvFinish.getText().toString());
+                startActivityForResult(new Intent(getActivity(), DisposalResultsActivity.class).putExtra("id", viewModel.eventId.get()), 1000);
             }
         });
         binding.tvRefuse.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                ChangeStatus("40", binding.tvRefuse.getText().toString());
+                ChangeStatus("60", binding.tvRefuse.getText().toString());
             }
         });
         binding.mapLocation.setOnClickListener(new View.OnClickListener() {
@@ -114,7 +133,7 @@ public class EventDetailsFragment extends BaseFragment {
                         showLoadingDialog();
                         Params params = new Params();
                         params.put("eventId", viewModel.eventId.get());
-                        params.put("id", getActivity().getIntent().getStringExtra("eventCode"));
+                        //params.put("id", getActivity().getIntent().getStringExtra("eventCode"));
                         params.put("status", status);
                         chooseStatusRequest.setParams(params);
                         chooseStatusRequest.execute(new ProcessErrorSubscriber() {
@@ -146,6 +165,26 @@ public class EventDetailsFragment extends BaseFragment {
 
     @Override
     public void loadData() {
+
+        Params params1 = new Params();
+        params1.put("dictType", "event_status");
+        getDictTypeRequest.setParams(params1);
+        getDictTypeRequest.execute(new ProcessErrorSubscriber<List<CameraTypeBean>>() {
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+                if (!TextUtils.isEmpty(e.getMessage())) {
+                    ToastUtils.show(e.getMessage());
+                }
+            }
+
+            @Override
+            public void onNext(List<CameraTypeBean> list) {
+                super.onNext(list);
+                eventStatusList.clear();
+                eventStatusList.addAll(list);
+            }
+        });
         showLoadingDialog();
         Params params = new Params();
         params.put("id", viewModel.eventId.get());
@@ -163,8 +202,8 @@ public class EventDetailsFragment extends BaseFragment {
             public void onNext(EventDetailsBean bean) {
                 super.onNext(bean);
                 hideLoadingDialog(LoadingDialog.LOADING_SUCCESS);
-                if (bean != null && bean.getDepts().size() > 0) {
-                    viewModel.title.set(bean.getEventName());
+                if (bean != null) {
+                    viewModel.title.set(bean.getCreateName());
                     viewModel.time.set(bean.getCreateTime());
                     viewModel.remark.set(bean.getRemark());
                     viewModel.longitude.set(Double.parseDouble(bean.getLongitude()));
@@ -175,26 +214,73 @@ public class EventDetailsFragment extends BaseFragment {
                     event.setLatitude(bean.getLatitude());
                     event.setLongitude(bean.getLongitude());
                     viewModel.setMessage(event);
-                    adapter.refreshList(bean.getDepts());
+                    deptXzList.clear();
+                    if (bean.getDepted() != null && eventStatusList.size() > 0) {
+                        deptXzList.add(bean.getDepted().getDeptXz().get(0));
+                        deptXzList.addAll(bean.getDepted().getDeptHg());
+                        for (int i = 0; i < deptXzList.size(); i++) {
+                            for (int j = 0; j < eventStatusList.size(); j++) {
+
+                                if (deptXzList.get(i).getStatus().equals(eventStatusList.get(j).getDictValue())) {
+                                    deptXzList.get(i).setStatusValue(eventStatusList.get(j).getDictLabel());
+                                }
+
+                            }
+                        }
+                    }
+                    adapter.refreshList(deptXzList);
+
                     if (bean.getStatus().equals("20")) {
-                        //待签收
-                        binding.tvCompleted.setVisibility(View.VISIBLE);
-                        binding.tvRefuse.setVisibility(View.VISIBLE);
-                        binding.tvNoNeed.setVisibility(View.VISIBLE);
-                        binding.tvTime.setGravity(Gravity.RIGHT | Gravity.CENTER_VERTICAL);
+                        //待签收  后台说1 2不可能同时存在
+                        if (PermsContains(bean.getPerms(), 1)) {
+                            binding.tvCompleted.setVisibility(View.VISIBLE);
+                            binding.tvRefuse.setVisibility(View.VISIBLE);
+                            binding.tvNoNeed.setVisibility(View.VISIBLE);
+                            binding.tvTime.setGravity(Gravity.RIGHT | Gravity.CENTER_VERTICAL);
+                        } else if (PermsContains(bean.getPerms(), 2)) {
+                            binding.tvRefuse.setVisibility(View.VISIBLE);
+                            binding.tvTime.setGravity(Gravity.RIGHT | Gravity.CENTER_VERTICAL);
+                        } else {
+                            binding.tvTime.setGravity(Gravity.LEFT | Gravity.CENTER_VERTICAL);
+                        }
+
+
                     } else if (bean.getStatus().equals("30")) {
                         //处理中
-                        binding.tvFinish.setVisibility(View.VISIBLE);
-                        binding.tvReport.setVisibility(View.VISIBLE);
-                        binding.tvTime.setGravity(Gravity.RIGHT | Gravity.CENTER_VERTICAL);
+                        if (PermsContains(bean.getPerms(), 2)) {
+                            binding.tvRefuse.setVisibility(View.VISIBLE);
+                            binding.tvTime.setGravity(Gravity.RIGHT | Gravity.CENTER_VERTICAL);
+                        } else if (PermsContains(bean.getPerms(), 1)) {
+                            binding.tvFinish.setVisibility(View.VISIBLE);
+                            binding.tvTime.setGravity(Gravity.RIGHT | Gravity.CENTER_VERTICAL);
+                        } else {
+                            binding.tvTime.setGravity(Gravity.LEFT | Gravity.CENTER_VERTICAL);
+
+                        }
+                        //binding.tvReport.setVisibility(View.VISIBLE);
+
                     } else {
+
                         binding.tvCompleted.setVisibility(View.GONE);
                         binding.tvRefuse.setVisibility(View.GONE);
                         binding.tvFinish.setVisibility(View.GONE);
-                        binding.tvTime.setGravity(Gravity.LEFT|Gravity.CENTER_VERTICAL);
+                        binding.tvTime.setGravity(Gravity.LEFT | Gravity.CENTER_VERTICAL);
                     }
                 }
             }
         });
     }
+
+    public boolean PermsContains(int[] array, int valueToFind) {
+        Arrays.sort(array); // 首先对数组进行排序
+        return Arrays.binarySearch(array, valueToFind) >= 0;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 1000 && resultCode == 1000) {
+            loadData();
+        }
+    }
 }

app/src/main/java/com/sjkj/appthreefloor_tsgz/fragment/EventFragment.java

@@ -112,7 +112,6 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
             public void onItemClick(EventBean bean, int position) {
                 Intent intent = new Intent(getActivity(), EventDetailsActivity.class);
                 intent.putExtra("id", bean.getId());
-                intent.putExtra("eventCode", bean.getEventCode());
                 startActivityForResult(intent, 1000);
             }
         });
@@ -200,13 +199,12 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
                     Gson gson = new Gson();
 
                     for (int i = 0; i < bean.getRows().size(); i++) {
-                        EventCenterListBean.EventCenter eventCenter = gson.fromJson(bean.getRows().get(i).getEventJson(), EventCenterListBean.EventCenter.class);
-                        String id = eventCenter.getId();
-                        String title = eventCenter.getEventName();
-                        String content = eventCenter.getRemark();
-                        String time = eventCenter.getCreateTime();
-                        String type = eventCenter.getEventType();
-                        String eventSource = eventCenter.getEventSource();
+                        String id = bean.getRows().get(i).getId();
+                        String title = bean.getRows().get(i).getCreateName();
+                        String content = bean.getRows().get(i).getRemark();
+                        String time = bean.getRows().get(i).getCreateTime();
+                        String type = bean.getRows().get(i).getEventType();
+                        String eventSource = bean.getRows().get(i).getEventSource();
                         String eventCode = bean.getRows().get(i).getId();
 
 
@@ -269,17 +267,15 @@ public class EventFragment extends BaseFragment /*implements View.OnClickListene
 
                     if (bean != null && bean.getRows().size() > 0) {
                         currentPage = currentPage + 1;
-                        Gson gson = new Gson();
 
                         for (int i = 0; i < bean.getRows().size(); i++) {
-                            EventCenterListBean.EventCenter eventCenter = gson.fromJson(bean.getRows().get(i).getEventJson(), EventCenterListBean.EventCenter.class);
-                            String id = eventCenter.getId();
-                            String title = eventCenter.getEventName();
-                            String content = eventCenter.getRemark();
-                            String time = eventCenter.getCreateTime();
-                            String type = eventCenter.getEventType();
-                            String eventSource = eventCenter.getEventSource();
-                            String eventCode = eventCenter.getId();
+                            String id = bean.getRows().get(i).getId();
+                            String title = bean.getRows().get(i).getCreateName();
+                            String content = bean.getRows().get(i).getRemark();
+                            String time = bean.getRows().get(i).getCreateTime();
+                            String type = bean.getRows().get(i).getEventType();
+                            String eventSource = bean.getRows().get(i).getEventSource();
+                            String eventCode = bean.getRows().get(i).getId();
 
 
                             EventBean eventBean = new EventBean(id, title, content, time, type, "", "", "", "", eventCode, eventSource);

app/src/main/java/com/sjkj/appthreefloor_tsgz/fragment/EventMessageFragment.java

@@ -32,8 +32,8 @@ import com.sjkj.appthreefloor_tsgz.adapter.ImageVideoAdapter;
 import com.sjkj.appthreefloor_tsgz.adapter.MessageDetailsAdapter;
 import com.sjkj.appthreefloor_tsgz.app.App;
 import com.sjkj.appthreefloor_tsgz.bean.EventMessageDetailsBean;
-import com.sjkj.appthreefloor_tsgz.bean.FileBean;
 import com.sjkj.appthreefloor_tsgz.bean.ImageBean;
+import com.sjkj.appthreefloor_tsgz.bean.ImageEventFilesBean;
 import com.sjkj.appthreefloor_tsgz.databinding.FragmentEventMessageBinding;
 import com.sjkj.appthreefloor_tsgz.fragment.viewModel.EventFargmentViewModel;
 import com.sjkj.appthreefloor_tsgz.net.EventAddFeedBackRequest;
@@ -43,6 +43,7 @@ import com.sjkj.appthreefloor_tsgz.utils.DownLoadUtils;
 import com.sjkj.appthreefloor_tsgz.utils.ImageUtils;
 import com.sjkj.appthreefloor_tsgz.utils.OpenFileUtil;
 import com.sjkj.appthreefloor_tsgz.weight.photoview.PhotoViewActivity;
+import com.sjkj.base_lib.adapter.BaseRecAdapter;
 import com.sjkj.base_lib.app.AppManager;
 import com.sjkj.base_lib.entity.Params;
 import com.sjkj.base_lib.net.domain.interactor.ProcessErrorSubscriber;
@@ -80,8 +81,7 @@ public class EventMessageFragment extends BaseFragment {
     private static final int TYPE_VIDEO = 2;
     static String mCurrentPhotoPath;
     static Uri capturedUri = null;
-    private List<ImageBean> imageBeans = new ArrayList<>();
-    private List<ImageBean> imageBeans_image = new ArrayList<>();
+    private List<ImageBean> imageBeanList = new ArrayList<>();
     private UploadFileRequest uploadFileRequest = new UploadFileRequest(App.getInstance());
     private ImageVideoAdapter imageAdapter;
 
@@ -127,7 +127,7 @@ public class EventMessageFragment extends BaseFragment {
 
     @Override
     public void initView() {
-        imageBeans_image.clear();
+        imageBeanList.clear();
         LinearLayoutManager manager = new LinearLayoutManager(getActivity());
         manager.setOrientation(RecyclerView.VERTICAL);
         binding.fkRecyclerView.setLayoutManager(manager);
@@ -268,16 +268,13 @@ public class EventMessageFragment extends BaseFragment {
                     ToastUtils.show("请输入内容或上传图片/视频");
                     return;
                 }
-                if (imageAdapter.getList() != null && imageAdapter.getList().size() > 0) {
-                    for (int i = 0; i < imageAdapter.getList().size(); i++) {
-                        Log.d("zhr1231", "===" + imageAdapter.getList().get(i).getRealUrl());
 
-                    }
-                }
                 showLoadingDialog();
                 Params params = new Params();
                 params.put("eventId", getActivity().getIntent().getStringExtra("id"));
+                params.put("status", "70");
                 params.put("remark", binding.etContent.getText().toString());
+                params.put("eventFiles", imageAdapter.getList());
                 addFeedBackRequest.setParams(params);
                 addFeedBackRequest.execute(new ProcessErrorSubscriber() {
                     @Override
@@ -294,6 +291,10 @@ public class EventMessageFragment extends BaseFragment {
                         super.onNext(o);
                         hideLoadingDialog(LoadingDialog.LOADING_SUCCESS);
                         ToastUtils.show("操作成功");
+                        binding.llPhotoVideo.setVisibility(binding.llPhotoVideo.getVisibility() == View.VISIBLE ? View.GONE : View.GONE);
+                        binding.etContent.setText("");
+                        binding.etContent.setHint("请输入内容或上传图片/视频");
+                        imageAdapter.clear();
                         loadData();
 
                     }
@@ -364,6 +365,41 @@ public class EventMessageFragment extends BaseFragment {
                 }
             }
         });
+
+        imageAdapter.setItemClick(new BaseRecAdapter.OnItemClick<ImageBean>() {
+            @Override
+            public void onItemClick(ImageBean bean, int position) {
+
+                if (bean.getType() == TYPE_IMAGE) {
+
+                    if (imageAdapter.getList() != null && imageAdapter.getList().size() > 0) {
+                        ArrayList<String> imageList = new ArrayList<>();
+                        for (int i = 0; i < imageAdapter.getList().size(); i++) {
+                            if (ImageUtils.ISIMAGE(imageAdapter.getList().get(i).getFileType())) {
+                                Log.d("zhr12313", imageAdapter.getList().get(i).getFileType());
+                                imageList.add(imageAdapter.getList().get(i).getRealUrl());
+                            }
+
+                        }
+
+
+                        Intent intent = new Intent(getActivity(), PhotoViewActivity.class);
+                        intent.putStringArrayListExtra("positionDataList", imageList);
+                        intent.putExtra("position", position);
+                        startActivity(intent);
+                    }
+                } else if (bean.getType() == TYPE_VIDEO) {
+                    if (isauthorization) {
+//                    //读写权限授权成功
+                        Intent intent = new Intent(getActivity(), MyVideoPlayerActivity.class);
+                        intent.putExtra("videoUrl", bean.getPath());
+                        startActivity(intent);
+                    } else {
+                        requestPermissionsReadAndWrite();
+                    }
+                }
+            }
+        });
     }
 
     private void DownLoadFile(String name, String group) {
@@ -390,7 +426,7 @@ public class EventMessageFragment extends BaseFragment {
     public void loadData() {
         showLoadingDialog();
         Params params = new Params();
-        params.put("eventId", getActivity().getIntent().getStringExtra("id"));
+        params.put("id", getActivity().getIntent().getStringExtra("id"));
         eventMessageListRequest.setParams(params);
         eventMessageListRequest.execute(new ProcessErrorSubscriber<List<EventMessageDetailsBean>>() {
             @Override
@@ -447,7 +483,7 @@ public class EventMessageFragment extends BaseFragment {
                         public void onSuccess(File file) {
                             //TODO 压缩成功后调用，返回压缩后的图片文件
                             uploadFileRequest.setFile(file);
-                            uploadFileRequest.execute(new ProcessErrorSubscriber<FileBean>() {
+                            uploadFileRequest.execute(new ProcessErrorSubscriber<ImageEventFilesBean>() {
                                 @Override
                                 public void onError(Throwable e) {
                                     super.onError(e);
@@ -456,16 +492,18 @@ public class EventMessageFragment extends BaseFragment {
                                 }
 
                                 @Override
-                                public void onNext(FileBean bean) {
+                                public void onNext(ImageEventFilesBean bean) {
                                     super.onNext(bean);
                                     hideLoadingDialog(LoadingDialog.LOADING_SUCCESS);
                                     ImageBean imageBean = new ImageBean();
                                     imageBean.setRealUrl(AppTools.getImageBaseUrl() + bean.getFileUrl());
-                                    imageBean.setFileNname(bean.getFileName());
+                                    imageBean.setFileUrl(bean.getFileUrl());
+                                    imageBean.setFileName(bean.getFileName());
+                                    imageBean.setFileSize(bean.getFileSize());
+                                    imageBean.setFileType(bean.getFileType());
                                     imageBean.setType(TYPE_IMAGE);
-                                    imageBeans.add(imageBean);
-                                    imageBeans_image.add(imageBean);
-                                    imageAdapter.refreshList(imageBeans_image);
+                                    imageBeanList.add(imageBean);
+                                    imageAdapter.refreshList(imageBeanList);
                                 }
                             });
                         }
@@ -539,7 +577,7 @@ public class EventMessageFragment extends BaseFragment {
             File imageFile = new File(compressedFilePath);
 
             uploadFileRequest.setFile(imageFile);
-            uploadFileRequest.execute(new ProcessErrorSubscriber<FileBean>() {
+            uploadFileRequest.execute(new ProcessErrorSubscriber<ImageEventFilesBean>() {
                 @Override
                 public void onError(Throwable e) {
                     super.onError(e);
@@ -548,17 +586,20 @@ public class EventMessageFragment extends BaseFragment {
                 }
 
                 @Override
-                public void onNext(FileBean bean) {
+                public void onNext(ImageEventFilesBean bean) {
                     super.onNext(bean);
                     //ToastUtils.show("上传成功" + bean.getWebUrl() + "-=-=");
                     hideLoadingDialog(LoadingDialog.LOADING_SUCCESS);
                     ImageBean imageBean = new ImageBean();
                     imageBean.setRealUrl(AppTools.getImageBaseUrl() + bean.getFileUrl());
-                    imageBean.setFileNname(bean.getFileName());
+                    imageBean.setFileUrl(bean.getFileUrl());
+                    imageBean.setFileName(bean.getFileName());
+                    imageBean.setFileSize(bean.getFileSize());
+                    imageBean.setFileType(bean.getFileType());
+                    imageBean.setPath(imageFile.getAbsolutePath());
                     imageBean.setType(TYPE_VIDEO);
-                    imageBeans.add(imageBean);
-                    imageBeans_image.add(imageBean);
-                    imageAdapter.refreshList(imageBeans_image);
+                    imageBeanList.add(imageBean);
+                    imageAdapter.refreshList(imageBeanList);
 
                 }
             });

app/src/main/java/com/sjkj/appthreefloor_tsgz/net/RetrofitService.java

@@ -12,6 +12,7 @@ import com.sjkj.appthreefloor_tsgz.bean.EventDetailsBean;
 import com.sjkj.appthreefloor_tsgz.bean.EventMessageDetailsBean;
 import com.sjkj.appthreefloor_tsgz.bean.ExoPlayerBean;
 import com.sjkj.appthreefloor_tsgz.bean.FileBean;
+import com.sjkj.appthreefloor_tsgz.bean.ImageEventFilesBean;
 import com.sjkj.appthreefloor_tsgz.bean.LogInRsaBean;
 import com.sjkj.appthreefloor_tsgz.bean.NoticeListBean;
 import com.sjkj.appthreefloor_tsgz.bean.ProFileBean;
@@ -50,7 +51,7 @@ public interface RetrofitService {
     Observable<ResponseBean<Object>> EventEdit(@Body Params params);
 
     //事件详情
-    @GET("event/getEventByEventId")
+    @GET("event/getEventById")
     Observable<ResponseBean<EventDetailsBean>> eventDetails(@QueryMap Params params);
 
     //资源详情
@@ -103,7 +104,7 @@ public interface RetrofitService {
     //上传文件
     @Multipart
     @POST("system/upload")
-    Observable<ResponseBean<FileBean>> upload(@Part MultipartBody.Part file);
+    Observable<ResponseBean<ImageEventFilesBean>> upload(@Part MultipartBody.Part file);
 
     //校验版本信息
     @POST("AppVersionController/getVersionInfo")

app/src/main/java/com/sjkj/appthreefloor_tsgz/net/UploadFileRequest.java

@@ -3,7 +3,7 @@ package com.sjkj.appthreefloor_tsgz.net;
 import android.content.Context;
 import android.util.Log;
 
-import com.sjkj.appthreefloor_tsgz.bean.FileBean;
+import com.sjkj.appthreefloor_tsgz.bean.ImageEventFilesBean;
 import com.sjkj.base_lib.entity.ResponseBean;
 import com.sjkj.base_lib.net.RetrofitFactory;
 import com.sjkj.base_lib.net.data.exception.BusinessException;
@@ -54,9 +54,9 @@ public class UploadFileRequest extends UseCase {
         LogInterceptor.isShowRequestBody = false;
         return service.upload(part)
                 .subscribeOn(Schedulers.io())
-                .flatMap(new Func1<ResponseBean<FileBean>, Observable<FileBean>>() {
+                .flatMap(new Func1<ResponseBean<ImageEventFilesBean>, Observable<ImageEventFilesBean>>() {
                     @Override
-                    public Observable<FileBean> call(ResponseBean<FileBean> responseBean) {
+                    public Observable<ImageEventFilesBean> call(ResponseBean<ImageEventFilesBean> responseBean) {
                         LogInterceptor.isShowRequestBody = true;
                         if (!ResponseBean.CODE_SUCCESS.
                                 equals(responseBean.getCode())) {

app/src/main/java/com/sjkj/appthreefloor_tsgz/utils/ImageUtils.java

@@ -5,6 +5,14 @@ import android.text.TextUtils;
 import java.util.Locale;
 
 public class ImageUtils {
+    public static  boolean ISIMAGE(String end){
+        if (end.equals("jpg") || end.equals("gif") || end.equals("png") || end.equals("jpeg") || end.equals("bmp")||end.equals("webp")||end.equals("psd")||end.equals("svg")||end.equals("tiff")) {
+
+            return true;
+        }else {
+            return false;
+        }
+    }
     public static boolean isImage(String path){
         if (TextUtils.isEmpty(path)){
             return false;

app/src/main/java/com/sjkj/appthreefloor_tsgz/weight/photoview/PhotoViewActivity.java

@@ -1,6 +1,7 @@
 package com.sjkj.appthreefloor_tsgz.weight.photoview;
 
 import android.graphics.drawable.Drawable;
+import android.util.Log;
 import android.view.View;
 
 import androidx.core.content.ContextCompat;
@@ -73,6 +74,7 @@ public class PhotoViewActivity extends BaseActivity {
                 public void onPageSelected(int position) {
                     currentPosition = position;
                     viewModel.title.set(currentPosition + 1 + "/" + imageUrls.size());
+                    getTitleView().setText(viewModel.title.get());
                 }
 
                 @Override

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

@@ -42,7 +42,7 @@
             android:background="@drawable/rounded_corners10"
             android:orientation="vertical"
             android:padding="15dp"
-            android:visibility="visible">
+            android:visibility="gone">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -110,7 +110,8 @@
                 android:layout_marginLeft="15dp"
                 android:layout_toLeftOf="@+id/iv_photo"
                 android:background="@drawable/rounded_30"
-                android:hint="请输入内容"
+                android:textColor="@color/black"
+                android:hint="请输入内容或上传图片/视频"
                 android:paddingLeft="20dp" />
 
             <ImageView

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

@@ -5,7 +5,7 @@
 
         <variable
             name="model"
-            type="com.sjkj.appthreefloor_tsgz.bean.EventDetailsBean.DeptsBean" />
+            type="com.sjkj.appthreefloor_tsgz.bean.EventDetailsBean.DeptXz" />
 
         <import type="android.view.View" />
     </data>
@@ -45,7 +45,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1.5"
             android:gravity="right"
-            android:text="@{model.createTime}"
+            android:text="@{model.updateTime}"
             android:textColor="#181818"
             android:textSize="14dp">
 

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

@@ -9,6 +9,7 @@
             type="com.sjkj.appthreefloor_tsgz.bean.EventBean" />
 
         <import type="android.view.View" />
+        <import type="android.text.TextUtils" />
     </data>
 
     <LinearLayout
@@ -92,7 +93,7 @@
                             android:layout_weight="1"
                             android:ellipsize="end"
                             android:maxLines="3"
-                            android:text="@{model.content}"
+                            android:text="@{TextUtils.isEmpty(model.content)?``:model.content}"
                             android:textColor="@color/color_gray_text"
                             android:textSize="14dp" />
 
@@ -125,6 +126,7 @@
 
                             <TextView
                                 android:layout_width="0dp"
+                                android:visibility="gone"
                                 android:layout_height="match_parent"
                                 android:layout_weight="1"
                                 android:gravity="center_vertical|left"

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

@@ -117,11 +117,12 @@
                     android:id="@+id/tv_content"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="15dp"
+                    android:layout_marginLeft="10dp"
                     android:layout_marginTop="10dp"
                     android:layout_marginRight="15dp"
                     android:layout_marginBottom="10dp"
                     android:text="@{model.remark}"
+                    android:visibility="@{TextUtils.isEmpty(model.remark)?View.GONE:View.VISIBLE}"
                     android:textColor="#1A1A1A">
 
                 </TextView>
@@ -129,6 +130,7 @@
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recyclerView_image"
                     android:layout_width="match_parent"
+                    android:layout_marginLeft="1dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
                     android:overScrollMode="never" />
@@ -137,14 +139,17 @@
                     android:id="@+id/recyclerView_file"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
                     android:layout_marginTop="5dp"
                     android:overScrollMode="never" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recyclerView_video"
+                    android:layout_marginLeft="10dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="5dp"
+                    android:layout_marginBottom="10dp"
                     android:overScrollMode="never" />
             </LinearLayout>
         </LinearLayout>

base-lib/src/main/java/com/sjkj/base_lib/utils/AppTools.java

@@ -481,7 +481,7 @@ public class AppTools {
     }
 
     public static String getImageBaseUrl() {
-        return mmkv.decodeString("baseUrl", "http://192.168.4.26:80");
+        return mmkv.decodeString("ImageBaseUrl", "http://192.168.4.26:80");
     }
 //    public static final String GATEWAY_URL = "sooka-mobile";
 //    public static final String GATEWAY_URL_SYSTEM = "system";