1.日志图片展示

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改

app/build.gradle

@@ -106,4 +106,5 @@ dependencies {
     implementation 'com.qmuiteam:qmui:2.0.0-alpha04'
     implementation 'com.contrarywind:Android-PickerView:4.1.6'
     implementation 'com.zhihu.android:matisse:0.5.2-beta3'
+    implementation 'cn.jzvd:jiaozivideoplayer:7.3.0'
 }

app/src/main/AndroidManifest.xml

@@ -25,8 +25,8 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:supportsRtl="true"
         android:networkSecurityConfig="@xml/network_security_config"
+        android:supportsRtl="true"
         android:theme="@style/Work.Base"
         android:usesCleartextTraffic="true">
         <activity
@@ -1245,11 +1245,11 @@
             android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".ui.activity.mes.ticket.MesTicketLogActivity"
-            android:configChanges="keyboardHidden|orientation"
             android:label="工作日志"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
+            android:configChanges="orientation|screenSize|keyboardHidden"
             android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".ui.activity.mes.ticket.MesTicketAddLogActivity"

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailFinishActivity.java

@@ -135,9 +135,6 @@ public class MesTicketDetailFinishActivity extends WorkToolBarActivity {
         imgList = new ArrayList<>();
         imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList);
         imgAdapter.bindToRecyclerView(rvImg);
-        imgList.add(null);
-        imgList.add(null);
-        imgList.add(null);
         imgAdapter.notifyDataSetChanged();
         getData();
     }

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailReviewActivity.java

@@ -6,10 +6,12 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+
 import com.alibaba.fastjson.JSON;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.mesBean.ImageBean;
 import com.wd.workoffice.bean.mesBean.ReviewBean;
 import com.wd.workoffice.bean.mesBean.SummaryBean;
 import com.wd.workoffice.bean.mesBean.TicketBean;
@@ -102,7 +104,7 @@ public class MesTicketDetailReviewActivity extends WorkToolBarActivity {
     @BindView(R.id.tv_score)
     TextView tvScore;
     private StarAdapter starAdapter;
-    private List<Object> imgList;
+    private List<ImageBean> imgList;
     private ImgAdapter imgAdapter;
     private SummaryBean dataBean;
     private TicketBean.ListBean data;

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListTakeOnActivity.java

@@ -157,7 +157,7 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.tv_go:
-                startActivity(MesTicketListTakeOnActivity.class);
+                startActivity(MesTicketListActivity.class);
                 finish();
                 break;
             case R.id.btn_add:

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketLogActivity.java

@@ -26,6 +26,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import cn.jzvd.Jzvd;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
 import io.reactivex.disposables.Disposable;
 
@@ -42,7 +43,7 @@ public class MesTicketLogActivity extends WorkToolBarActivity {
     @BindView(R.id.srl_refresh)
     SmartRefreshLayout srlRefresh;
     private Map<String, Object> param;
-    private List<Object> dataList;
+    private List<LogBean> dataList;
     private MesTicketLogAdapter dataAdapter;
 
     @Override
@@ -55,7 +56,7 @@ public class MesTicketLogActivity extends WorkToolBarActivity {
     @Override
     protected void initData() {
         dataList = new ArrayList<>();
-        dataAdapter = new MesTicketLogAdapter(R.layout.item_mes_ticket_log, dataList);
+        dataAdapter = new MesTicketLogAdapter(R.layout.item_mes_ticket_log, dataList,MesTicketLogActivity.this);
         dataAdapter.bindToRecyclerView(rvData);
         dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
         param = WorkUtils.simpleParam();
@@ -100,12 +101,25 @@ public class MesTicketLogActivity extends WorkToolBarActivity {
                 getData();
             }
         });
+
     }
 
     @Override
     protected int layoutId() {
         return R.layout.activity_pro_price;
     }
+    @Override
+    public void onBackPressed() {
+        if (Jzvd.backPress()) {
+            return;
+        }
+        super.onBackPressed();
+    }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        Jzvd.releaseAllVideos();
+    }
 
 }

app/src/main/java/com/wd/workoffice/ui/adapter/ImgAdapter.java

@@ -3,11 +3,13 @@ package com.wd.workoffice.ui.adapter;
 
 import android.widget.ImageView;
 
+import com.bumptech.glide.load.ImageHeaderParser;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.mesBean.ImageBean;
 import com.wd.workoffice.util.GlideUtils;
+import com.wd.workoffice.util.WorkUtils;
 
 import java.util.List;
 
@@ -26,6 +28,7 @@ public class ImgAdapter extends BaseQuickAdapter<ImageBean, BaseViewHolder> {
     protected void convert(BaseViewHolder helper, ImageBean item) {
         ImageView ivImg = helper.getView(R.id.iv_img);
         GlideUtils.getRequest().load(item.getUrl()).into(ivImg);
+        helper.addOnClickListener(R.id.iv_img);
     }
 }
 

app/src/main/java/com/wd/workoffice/ui/adapter/MesTicketLogAdapter.java

 package com.wd.workoffice.ui.adapter;
 
 
+import android.content.Context;
 import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -9,23 +10,31 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.bean.ProPriceBean;
 import com.wd.workoffice.bean.mesBean.ImageBean;
 import com.wd.workoffice.bean.mesBean.LogBean;
+import com.wd.workoffice.ui.activity.mes.ticket.MesTicketLogActivity;
+import com.wd.workoffice.util.WorkUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import cn.jzvd.JzvdStd;
 
 /**
  * Created by flexible on 2018/8/13.
  */
 
 public class MesTicketLogAdapter extends BaseQuickAdapter<LogBean, BaseViewHolder> {
-
+    Context context;
     public MesTicketLogAdapter(int layoutResId, List data) {
         super(layoutResId, data);
     }
 
+    public MesTicketLogAdapter(int layoutResId, @Nullable List<LogBean> data, Context context) {
+        super(layoutResId, data);
+        this.context = context;
+    }
 
     @Override
     protected void convert(BaseViewHolder helper, LogBean item) {
@@ -35,6 +44,15 @@ public class MesTicketLogAdapter extends BaseQuickAdapter<LogBean, BaseViewHolde
         List<ImageBean> imgList = item.getAttachments();
         ImgAdapter imgAdapter = new ImgAdapter(R.layout.item_mes_ticket_img, imgList);
         imgAdapter.bindToRecyclerView(rvImg);
+        imgAdapter.setOnItemChildClickListener(new OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+                if (!WorkUtils.isImg(imgList.get(position).getType())) {
+                    JzvdStd.startFullscreenDirectly(context,
+                            JzvdStd.class, imgList.get(position).getUrl(), "");
+                }
+            }
+        });
         helper.setText(R.id.tv_time, item.getLogDateTime());
         helper.setText(R.id.tv_name, item.getWriteUserName());
         helper.setText(R.id.tv_content, item.getJobContent());

app/src/main/java/com/wd/workoffice/util/WorkUtils.java

@@ -13,6 +13,7 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.bumptech.glide.load.ImageHeaderParser;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.Config;
@@ -345,7 +346,16 @@ public class WorkUtils {
         return allChildren;
     }
 
-
+    /**
+     * 是否是图片
+     *
+     * @return
+     */
+    public static boolean isImg(String type) {
+        return TextUtils.equals("jpeg",type)|| TextUtils.equals("gif",type)|| TextUtils.equals("webp",type)||
+                TextUtils.equals("png",type)|| TextUtils.equals("bmp",type)||TextUtils.equals("JPEG",type)|| TextUtils.equals("GIF",type)|| TextUtils.equals("WEBP",type)||
+                TextUtils.equals("PNG",type)|| TextUtils.equals("BMP",type);
+    }
     /**
      * 小星星布局
      *