1.

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.wd.workoffice"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 10
-        versionName "1.0.10"
+        versionCode 12
+        versionName "1.0.12"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders = [
                 JPUSH_PKGNAME: applicationId,
@@ -98,7 +98,7 @@ dependencies {
     implementation 'com.ashokvarma.android:bottom-navigation-bar:2.2.0'
     implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.45-androidx'
     implementation 'com.qmuiteam:qmui:2.0.0-alpha04'
-    implementation 'com.contrarywind:Android-PickerView:4.1.6'
+    implementation 'com.contrarywind:Android-PickerView:4.1.9'
     implementation 'com.zhihu.android:matisse:0.5.2-beta3'
     implementation 'cn.jzvd:jiaozivideoplayer:7.4.1'
     implementation 'me.rosuh:AndroidFilePicker:0.6.2'

app/src/main/AndroidManifest.xml

@@ -35,6 +35,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/Work.Base"
+        android:largeHeap="true"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".ui.activity.MainActivity"

app/src/main/java/com/wd/workoffice/bean/event/ChangeChildEvent.java

+package com.wd.workoffice.bean.event;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ * date: 2021-10-24
+ **/
+public  class ChangeChildEvent {
+}

app/src/main/java/com/wd/workoffice/bean/mesBean/PermissionBean.java

+package com.wd.workoffice.bean.mesBean;
+
+import java.util.List;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ * date: 2021-11-03
+ **/
+public class PermissionBean {
+
+        private String text;
+        private String id;
+        private Object parentId;
+        private String levelCode;
+        private List<NodesBean> nodes;
+        private String icon;
+        private Object url;
+        private String description;
+        private Object appIcon;
+
+        public String getText() {
+            return text;
+        }
+
+        public void setText(String text) {
+            this.text = text;
+        }
+
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public Object getParentId() {
+            return parentId;
+        }
+
+        public void setParentId(Object parentId) {
+            this.parentId = parentId;
+        }
+
+        public String getLevelCode() {
+            return levelCode;
+        }
+
+        public void setLevelCode(String levelCode) {
+            this.levelCode = levelCode;
+        }
+
+        public List<NodesBean> getNodes() {
+            return nodes;
+        }
+
+        public void setNodes(List<NodesBean> nodes) {
+            this.nodes = nodes;
+        }
+
+        public String getIcon() {
+            return icon;
+        }
+
+        public void setIcon(String icon) {
+            this.icon = icon;
+        }
+
+        public Object getUrl() {
+            return url;
+        }
+
+        public void setUrl(Object url) {
+            this.url = url;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        public Object getAppIcon() {
+            return appIcon;
+        }
+
+        public void setAppIcon(Object appIcon) {
+            this.appIcon = appIcon;
+        }
+
+        public static class NodesBean {
+            private String text;
+            private List<String> tags;
+            private String id;
+            private String parentId;
+            private String levelCode;
+            private Object nodes;
+            private Object icon;
+            private Object url;
+            private String description;
+            private Object appIcon;
+
+            public String getText() {
+                return text;
+            }
+
+            public void setText(String text) {
+                this.text = text;
+            }
+
+            public List<String> getTags() {
+                return tags;
+            }
+
+            public void setTags(List<String> tags) {
+                this.tags = tags;
+            }
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+
+            public String getParentId() {
+                return parentId;
+            }
+
+            public void setParentId(String parentId) {
+                this.parentId = parentId;
+            }
+
+            public String getLevelCode() {
+                return levelCode;
+            }
+
+            public void setLevelCode(String levelCode) {
+                this.levelCode = levelCode;
+            }
+
+            public Object getNodes() {
+                return nodes;
+            }
+
+            public void setNodes(Object nodes) {
+                this.nodes = nodes;
+            }
+
+            public Object getIcon() {
+                return icon;
+            }
+
+            public void setIcon(Object icon) {
+                this.icon = icon;
+            }
+
+            public Object getUrl() {
+                return url;
+            }
+
+            public void setUrl(Object url) {
+                this.url = url;
+            }
+
+            public String getDescription() {
+                return description;
+            }
+
+            public void setDescription(String description) {
+                this.description = description;
+            }
+
+            public Object getAppIcon() {
+                return appIcon;
+            }
+
+            public void setAppIcon(Object appIcon) {
+                this.appIcon = appIcon;
+            }
+        }
+}

app/src/main/java/com/wd/workoffice/bean/mesBean/WokrOrderBean.java

@@ -121,6 +121,15 @@ public class WokrOrderBean extends BaseMesPageBean {
         private String procId;
         private String approved;
         private Integer isSave;
+        private String isMyOrder;
+
+        public String getIsMyOrder() {
+            return isMyOrder;
+        }
+
+        public void setIsMyOrder(String isMyOrder) {
+            this.isMyOrder = isMyOrder;
+        }
 
         public Integer getIsSave() {
             return isSave;

app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java

@@ -1114,5 +1114,10 @@ public interface MesApiService {
     @POST("/himes/api/workOrder/add/updateMaterial.json")
     Observable<BaseMesBean> updateMaterial(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
+    /**
+     * @return
+     */
+    @POST("/himes/api/main/getRoleFunction.json")
+    Observable<BaseMesBean> getRoleFunction();
 
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityAddActivity.java

@@ -36,7 +36,10 @@ import com.wd.workoffice.bean.mesBean.MesClientBean;
 import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.mes.ImageActivity;
 import com.wd.workoffice.ui.activity.mes.MesProActivity;
+import com.wd.workoffice.ui.activity.mes.VideoActivity;
+import com.wd.workoffice.ui.activity.mes.ticket.MesTicketAddLogActivity;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketClientActivity;
 import com.wd.workoffice.ui.activity.mes.ticket.TicketProActivity;
 import com.wd.workoffice.ui.adapter.ImgAddAdapter;
@@ -241,11 +244,11 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
             param.put("defectName", chooseDefect.getDefectName());
         }
         if (TextUtils.isEmpty(getIntent().getStringExtra("data"))) {
-            if (WorkUtils.hasMesMenuPermission(JSON.parseArray(getIntent().getStringExtra("permission")), "新建")) {
+            if (WorkUtils.hasMesMenuPermission(JSON.parseArray(getIntent().getStringExtra("permission")), "新建、保存、提交")) {
                 btnAdd.setVisibility(View.VISIBLE);
             }
         } else {
-            btnSubmit.setVisibility(View.VISIBLE);
+            btnAdd.setVisibility(View.VISIBLE);
         }
     }
 
@@ -262,12 +265,26 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
         imgAddAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                if (imgList.size() > 9) {
-                    toast("最大上传9张");
-                    return;
-                }
+
                 if (position == imgList.size() - 1) {
+                    if (imgList.size() > 9) {
+                        toast("最大上传9张");
+                        return;
+                    }
                     addImg();
+                }else {
+                    if (!WorkUtils.isImg(imgList.get(position).getType())) {
+//                    JzvdStd.startFullscreenDirectly(context,
+//                            JzvdStd.class, imgList.get(position).getUrl(), "");
+                        Intent intent =new Intent(MesQualityAddActivity.this, VideoActivity.class);
+                        intent.putExtra( "url","http://124.129.27.194:81/" +imgList.get(position).getPath());
+                        startActivity(intent);
+
+                    }else {
+                        Intent intent =new Intent(MesQualityAddActivity.this, ImageActivity.class);
+                        intent.putExtra( "url","http://124.129.27.194:81/" + imgList.get(position).getPath());
+                        startActivity(intent);
+                    }
                 }
             }
         });

app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceDetailActivity.java

 package com.wd.workoffice.ui.activity.mes.repair;
 
-import android.os.Bundle;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -24,7 +23,6 @@ import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -98,7 +96,7 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
     protected void initView() {
         ButterKnife.bind(this);
         rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
-        rvData.setNestedScrollingEnabled(false);
+//        rvData.setNestedScrollingEnabled(false);
     }
 
 
@@ -237,29 +235,21 @@ public class ServiceDetailActivity extends WorkToolBarActivity {
                 finishRequest();
                 break;
             case R.id.rl_true_star_time:
-                PickTimeUtils.showPick(this, new OnTimeSelectListener() {
+                PickTimeUtils.showPickDialog(this, new OnTimeSelectListener() {
                     @Override
                     public void onTimeSelect(Date date, View view) {
                         tvTrueStarTime.setText(TimeUtils.date2String(date));
                         info.setActualStartDateTime(tvTrueStarTime.getText().toString());
 
-//                        paramMap.put("createDateTime", TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
-//                        page = 1;
-//                        param.put("pageNum", page);
-//                        getData();
                     }
                 }).show();
                 break;
             case R.id.rl_true_end_time:
-                PickTimeUtils.showPick(this, new OnTimeSelectListener() {
+                PickTimeUtils.showPickDialog(this, new OnTimeSelectListener() {
                     @Override
                     public void onTimeSelect(Date date, View view) {
                         tvTrueEndTime.setText(TimeUtils.date2String(date));
                         info.setActualEndDateTime(tvTrueEndTime.getText().toString());
-//                        paramMap.put("createDateTime", TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd")));
-//                        page = 1;
-//                        param.put("pageNum", page);
-//                        getData();
                     }
                 }).show();
                 break;

app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceFaultActivity.java

@@ -325,9 +325,10 @@ public class ServiceFaultActivity extends WorkToolBarActivity {
             param.put("locaCode", machine.getLocationCode());
             param.put("locaDesc", machine.getLocationName());
             param.put("locationId", machine.getLocationId());
+            param.put("appType", 2);
             baseMesBeanObservable = RtfUtils.getMesRtf().opmreporterror("00d12c310f4411ea8334fa163e1166bd", 3,
                     WorkUtils.convertMapToBody(param));
-//            param.put("failureCode", chooseFaultTypeBean.getCode());
+
         } else {
             //最外层
             param.put("siteId", dataService.getSiteId());
@@ -339,6 +340,7 @@ public class ServiceFaultActivity extends WorkToolBarActivity {
             param.put("locaCode", dataService.getLocationCode());
             param.put("locaDesc", dataService.getLocationName());
             param.put("locationId", dataService.getLocationId());
+            param.put("appType", 1);
             baseMesBeanObservable = RtfUtils.getMesRtf().opmreporterror("00d12c310f4411ea8334fa163e1166bd", 3,
                     WorkUtils.convertMapToBody(param));
 //            param.put("reportCode", chooseFaultTypeBean.getCode());

app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceStandardActivity.java

@@ -12,6 +12,7 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.Config;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.event.ChangeChildEvent;
 import com.wd.workoffice.bean.event.ChangeStatus;
 import com.wd.workoffice.bean.mesBean.ServiceStandardBean;
 import com.wd.workoffice.retrofit.RtfUtils;
@@ -217,7 +218,7 @@ public class ServiceStandardActivity extends WorkToolBarActivity {
     }
 
     @Subscribe
-    public void refresh(ChangeStatus event) {
+    public void refresh(ChangeChildEvent event) {
         page = 1;
         param.put("pageNum", 1);
         if (!TextUtils.isEmpty(getIntent().getStringExtra("type"))) {//维修

app/src/main/java/com/wd/workoffice/ui/activity/mes/repair/ServiceStandardDetailActivity.java

@@ -16,6 +16,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.event.ChangeChildEvent;
 import com.wd.workoffice.bean.event.ChangeStatus;
 import com.wd.workoffice.bean.mesBean.ServiceBean;
 import com.wd.workoffice.bean.mesBean.ServiceCheckBean;
@@ -72,8 +73,8 @@ public class ServiceStandardDetailActivity extends WorkToolBarActivity {
     private String[] statusList = new String[]{"正常", "异常"};
     private Integer[] statusValue = new Integer[]{0, 1};//0正常 1异常
     private Integer[] normalValue = new Integer[]{1, 0};//0异常 1正常
-    private int chooseStatus;
-    private int chooseNormal;
+    private int chooseStatus = -1;
+    private int chooseNormal = -1;
 
     @Override
     protected void initView() {
@@ -204,8 +205,19 @@ public class ServiceStandardDetailActivity extends WorkToolBarActivity {
 //        param.put("numA", "");
 //        param.put("numB", "");
 //        param.put("numC", "");
-        info.setStatus(chooseStatus + "");
-        info.setNormal(chooseNormal + "");
+
+        if (TextUtils.isEmpty(getIntent().getStringExtra("type"))) {
+            if (chooseStatus != -1) {
+
+                info.setStatus(chooseStatus + "");
+            }
+        } else {
+            if (chooseNormal != -1) {
+                info.setNormal(chooseNormal + "");
+            }
+        }
+
+
         info.setFailureCode(tvFailureCode.getText().toString());
 //        WorkUtils.convertMapToBody(JSON.parseObject(JSON.toJSONString(info))))
         Observable<BaseMesBean> baseMesBeanObservable;
@@ -236,7 +248,7 @@ public class ServiceStandardDetailActivity extends WorkToolBarActivity {
                     toast(data.getMessage());
                     return;
                 }
-                EventBus.getDefault().post(new ChangeStatus());
+                EventBus.getDefault().post(new ChangeChildEvent());
                 toast("保存成功");
                 finish();
             }

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

@@ -25,6 +25,8 @@ import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.bean.mesBean.TicketBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.mes.ImageActivity;
+import com.wd.workoffice.ui.activity.mes.VideoActivity;
 import com.wd.workoffice.ui.adapter.ImgAddAdapter;
 import com.wd.workoffice.util.Glide4Engine;
 import com.wd.workoffice.util.GlideUtils;
@@ -54,6 +56,8 @@ import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
+import static flexible.xd.android_base.utils.ActivityUtils.startActivity;
+
 /**
  * 工单新增
  * author : flexible
@@ -151,12 +155,26 @@ public class MesTicketAddLogActivity extends WorkToolBarActivity {
         imgAddAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                if (imgList.size() > 3) {
-                    toast("最大上传3张");
-                    return;
-                }
+
                 if (position == imgList.size() - 1) {
+                    if (imgList.size() > 3) {
+                        toast("最大上传3张");
+                        return;
+                    }
                     addImg();
+                }else {
+                    if (!WorkUtils.isImg(imgList.get(position).getType())) {
+//                    JzvdStd.startFullscreenDirectly(context,
+//                            JzvdStd.class, imgList.get(position).getUrl(), "");
+                        Intent intent =new Intent(MesTicketAddLogActivity.this, VideoActivity.class);
+                        intent.putExtra( "url","http://124.129.27.194:81/" +imgList.get(position).getPath());
+                        startActivity(intent);
+
+                    }else {
+                        Intent intent =new Intent(MesTicketAddLogActivity.this, ImageActivity.class);
+                        intent.putExtra( "url","http://124.129.27.194:81/" + imgList.get(position).getPath());
+                        startActivity(intent);
+                    }
                 }
             }
         });
@@ -286,7 +304,12 @@ public class MesTicketAddLogActivity extends WorkToolBarActivity {
         } else {
             file = new File(uri.toString());
         }
-        File uploadFile = WorkUtils.getSmallImg(file, this);
+        File uploadFile;
+        if (WorkUtils.isImg(file.getName().split("\\.")[1])){
+             uploadFile = WorkUtils.getSmallImg(file, this);
+        }else {
+            uploadFile =file;
+        }
         RequestBody requestFile = RequestBody.create(MediaType.parse("multipart/form-data"), uploadFile);
         RtfUtils.getMesRtf().
                 upload(MultipartBody.Part.createFormData("file", file.getName(), requestFile)).

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

@@ -30,7 +30,9 @@ import com.wd.workoffice.bean.mesBean.MesProBean;
 import com.wd.workoffice.bean.mesBean.TicketBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.mes.ImageActivity;
 import com.wd.workoffice.ui.activity.mes.MesProActivity;
+import com.wd.workoffice.ui.activity.mes.VideoActivity;
 import com.wd.workoffice.ui.adapter.AnnexAdapter;
 import com.wd.workoffice.ui.adapter.ImgAddAdapter;
 import com.wd.workoffice.util.DialogUtils;
@@ -205,6 +207,19 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 if (position == imgList.size() - 1) {
                     addImg();
+                }else {
+                    if (!WorkUtils.isImg(imgList.get(position).getType())) {
+//                    JzvdStd.startFullscreenDirectly(context,
+//                            JzvdStd.class, imgList.get(position).getUrl(), "");
+                        Intent intent =new Intent(MesTicketAddSummaryActivity.this, VideoActivity.class);
+                        intent.putExtra( "url","http://124.129.27.194:81/" +imgList.get(position).getPath());
+                        startActivity(intent);
+
+                    }else {
+                        Intent intent =new Intent(MesTicketAddSummaryActivity.this, ImageActivity.class);
+                        intent.putExtra( "url","http://124.129.27.194:81/" + imgList.get(position).getPath());
+                        startActivity(intent);
+                    }
                 }
             }
         });

app/src/main/java/com/wd/workoffice/ui/activity/mes/work/QualityWorkFragment.java

@@ -654,7 +654,7 @@ public class QualityWorkFragment extends WorkBaseFg {
             toast("请选择关联单号");
             return;
         }
-        if (info.getWorkType() == 4 && (!addReason || !addSolve)) {
+        if (info.getStatus() == 3 && info.getWorkType() == 4 && (!addReason || !addSolve)) {
             toast("请填写故障原因、解决措施");
             return;
         }
@@ -687,15 +687,24 @@ public class QualityWorkFragment extends WorkBaseFg {
         }
         info.setWorkType(chooseType);
 
-
-        info.setActStart(TimeUtils.string2Millis(trueStart));
-        info.setActFinish(TimeUtils.string2Millis(trueEnd));
-
-
-        info.setShutdownTime(TimeUtils.string2Millis(offTime));
-        info.setRecoveryTime(TimeUtils.string2Millis(onTime));
-        info.setSchedStart(TimeUtils.string2Millis(planStart));
-        info.setSchedFinish(TimeUtils.string2Millis(planEnd));
+        if (!TextUtils.isEmpty(trueStart)) {
+            info.setActStart(TimeUtils.string2Millis(trueStart));
+        }
+        if (!TextUtils.isEmpty(trueEnd)) {
+            info.setActFinish(TimeUtils.string2Millis(trueEnd));
+        }
+        if (!TextUtils.isEmpty(offTime)) {
+            info.setShutdownTime(TimeUtils.string2Millis(offTime));
+        }
+        if (!TextUtils.isEmpty(onTime)) {
+            info.setRecoveryTime(TimeUtils.string2Millis(onTime));
+        }
+        if (!TextUtils.isEmpty(planStart)) {
+            info.setSchedStart(TimeUtils.string2Millis(planStart));
+        }
+        if (!TextUtils.isEmpty(planEnd)) {
+            info.setSchedFinish(TimeUtils.string2Millis(planEnd));
+        }
         info.setDescription(name);
         info.setDetailedInformation(detailInfo);
         switch (type) {//1 保存 2 提交審核 3 通過 4 駁回 5完成  6 确认完成
@@ -741,7 +750,7 @@ public class QualityWorkFragment extends WorkBaseFg {
                     return;
                 }
                 EventBus.getDefault().post(new ChangeStatus());
-                toast("提交成功");
+                toast("操作成功");
             }
         });
     }
@@ -847,6 +856,11 @@ public class QualityWorkFragment extends WorkBaseFg {
                 break;
             case 4:
                 break;
+            case 6:
+                canModify = true;
+                tvName.setFocusable(true);
+                tvDetailInfo.setFocusable(true);
+                break;
         }
         return canModify;
     }

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

@@ -34,6 +34,9 @@ public class MesServiceStandardAdapter extends BaseQuickAdapter<ServiceStandardB
             helper.setText(R.id.tv_name, String.format("检查项目:%s", item.getCheckProject()));
             if (!TextUtils.isEmpty(item.getStatus())) {
                 helper.setText(R.id.tv_status, TextUtils.equals(item.getStatus(), "1") ? "异常" : "正常");//1 异常 0正常
+            }else {
+                helper.setText(R.id.tv_status, "");//1正常  0异常
+
             }
             helper.setText(R.id.tv_content1, item.getProcessStandard());
             helper.setText(R.id.tv_content2, item.getMeasurementUnit());
@@ -42,6 +45,8 @@ public class MesServiceStandardAdapter extends BaseQuickAdapter<ServiceStandardB
             helper.setText(R.id.tv_name, String.format("检查项目:%s", item.getInspoProDescription()));
             if (!TextUtils.isEmpty(item.getNormal())) {
                 helper.setText(R.id.tv_status, TextUtils.equals(item.getNormal(), "0") ? "异常" : "正常");//1正常  0异常
+            }else {
+                helper.setText(R.id.tv_status, "");//1正常  0异常
             }
             helper.setText(R.id.tv_content1, item.getProcessStandard());
             helper.setText(R.id.tv_content2, item.getUint());

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

@@ -30,6 +30,7 @@ public class QualityWorkAdapter extends BaseQuickAdapter<WokrOrderBean.ListBean,
         helper.setText(R.id.tv_location, item.getSiteName());
         helper.setText(R.id.tv_position, item.getLocationName());
         helper.setText(R.id.tv_time, TimeUtils.millis2String(item.getCreateDateTime()));
+        helper.setText(R.id.tv_is_me, item.getIsMyOrder());
 
     }
 }

app/src/main/java/com/wd/workoffice/ui/fg/MesFragment.java

 package com.wd.workoffice.ui.fg;
 
+import android.text.TextUtils;
 import android.view.View;
 
 import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkBaseFg;
+import com.wd.workoffice.bean.mesBean.PermissionBean;
 import com.wd.workoffice.bean.vo.BatLayoutVo;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.activity.mes.MesMonitorActivity;
-import com.wd.workoffice.ui.activity.mes.MesMonitorDetailActivity;
-import com.wd.workoffice.ui.activity.mes.analysis.MesAnalysisActivity;
-import com.wd.workoffice.ui.activity.mes.defect.MesDefectActivity;
-import com.wd.workoffice.ui.activity.mes.repair.MesServiceActivity;
 import com.wd.workoffice.ui.activity.mes.QualityTraceabilityActivity;
+import com.wd.workoffice.ui.activity.mes.analysis.MesAnalysisActivity;
 import com.wd.workoffice.ui.activity.mes.order.MesOrderProcessActivity;
+import com.wd.workoffice.ui.activity.mes.repair.MesServiceActivity;
 import com.wd.workoffice.ui.activity.mes.report.MesReportActivity;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketActivity;
 import com.wd.workoffice.ui.activity.mes.work.QualityWorkActivity;
@@ -28,6 +31,8 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
 
 
 /**
@@ -54,12 +59,77 @@ public class MesFragment extends WorkBaseFg {
             "质量追溯", "检维修记录"
             , "市场服务", "设备工单", "设备监控"};
 
+    Class[] jumpClazz = new Class[]{MesOrderProcessActivity.class, MesReportActivity.class, MesAnalysisActivity.class,
+            QualityTraceabilityActivity.class, MesServiceActivity.class
+            , MesTicketActivity.class, QualityWorkActivity.class, MesMonitorActivity.class};
+
 
     @Override
     protected void initView() {
         ButterKnife.bind(this, getContentView());
-        addDate(dataList, dataImg, dataName);
-        initRvLayout(rvData, dataList);
+//        addDate(dataList, dataImg, dataName);
+//        initRvLayout(rvData, dataList);
+
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getMesRtf().getRoleFunction().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseMesBean data) {
+                hideLoading();
+                if (!data.isSuccess()) {
+                    toast(data.getMessage());
+                    return;
+                }
+                List<PermissionBean> permissionList = JSON.parseArray(data.getData().toString(), PermissionBean.class);
+                List<Integer> imgList = new ArrayList<>();
+                List<String> nameList = new ArrayList<>();
+                List<Class> classList = new ArrayList<>();
+
+                for (PermissionBean permissionBean : permissionList) {
+                    if (TextUtils.equals(permissionBean.getText(), "APP管理")) {
+                        List<PermissionBean.NodesBean> nodes = permissionBean.getNodes();
+                        for (PermissionBean.NodesBean node : nodes) {
+                            for (int i = 0; i < dataName.length; i++) {
+                                if (node.getText().contains(dataName[i])) {
+                                    imgList.add(dataImg[i]);
+                                    nameList.add(dataName[i]);
+                                    classList.add(jumpClazz[i]);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+                dataList.clear();
+                addDate(dataList, imgList, nameList);
+                initRvLayout(rvData, dataList, classList);
+            }
+        });
+    }
+
+    private void initRvLayout(RecyclerView rvSale, List<BatLayoutVo> dataList, List<Class> classList) {
+        rvSale.setLayoutManager(new GridLayoutManager(getActivity(), 3, RecyclerView.VERTICAL,
+                false));
+        BatLayoutAdapter batLayoutAdapter = new BatLayoutAdapter(R.layout.item_mes_layout, dataList);
+        batLayoutAdapter.bindToRecyclerView(rvSale);
+        batLayoutAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(classList.get(position));
+            }
+        });
     }
 
 
@@ -91,6 +161,16 @@ public class MesFragment extends WorkBaseFg {
 
     }
 
+    private void addDate(List<BatLayoutVo> saleList, List<Integer> saleImg, List<String> saleName) {
+        for (int i = 0; i < saleImg.size(); i++) {
+            BatLayoutVo batLayoutVo = new BatLayoutVo();
+            batLayoutVo.setImg(saleImg.get(i));
+            batLayoutVo.setName(saleName.get(i));
+            saleList.add(batLayoutVo);
+        }
+
+    }
+
     /**
      * 初始化布局
      *

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

@@ -20,7 +20,16 @@ public class PickTimeUtils {
 //                .setRangDate(startDate, endDate);
         return pvTime.build();
     }
+    public static TimePickerView showPickDialog(Context ctx, OnTimeSelectListener listener) {
+//        Calendar startDate = Calendar.getInstance();
+//        Calendar endDate = Calendar.getInstance();
 
+        //正确设置方式 原因：注意事项有说明
+        TimePickerBuilder pvTime = new TimePickerBuilder(ctx, listener);
+        pvTime.setType(new boolean[]{true, true, true, true, true, true}).setTitleSize(14).setContentTextSize(14).setSubCalSize(14);
+//                .setRangDate(startDate, endDate);
+        return pvTime.isDialog(true).build();
+    }
     public static TimePickerView showPickThree(Context ctx, OnTimeSelectListener listener) {
 //        TimePickerBuilder pvTime = new TimePickerBuilder(ctx, listener);
 //        pvTime.setType(new boolean[]{true, true, true, false, false, false}).setTitleSize(16).setContentTextSize(16).

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

@@ -1019,6 +1019,9 @@ public class WorkUtils {
                 break;
             case 4:
                 break;
+            case 6:
+                canModify = true;
+                break;
         }
         return canModify;
     }

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

@@ -38,7 +38,7 @@
             android:paddingBottom="20mm">
 
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -55,12 +55,14 @@
 
                 <TextView
                     android:id="@+id/tv_process_standard"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:gravity="right"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:textColor="@color/flexible_text_gray"
                     android:textSize="14sp" />
-            </RelativeLayout>
+            </LinearLayout>
 
             <View style="@style/dividerX" />
 

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

@@ -19,7 +19,7 @@
         android:background="#FCFCFD"
         android:paddingVertical="10mm">
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="wrap_content"
@@ -36,13 +36,13 @@
 
             <TextView
                 android:id="@+id/tv_project"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:gravity="right"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="13sp" />
-        </RelativeLayout>
+        </LinearLayout>
 
         <ImageView
         android:layout_width="wrap_content"

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

@@ -9,13 +9,14 @@
     android:paddingHorizontal="10mm"
     android:paddingVertical="10mm">
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <TextView
             android:id="@+id/tv_name"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:text="设备"
@@ -28,7 +29,7 @@
             android:layout_alignParentRight="true"
             android:textColor="@color/orange"
             android:textSize="13sp" />
-    </RelativeLayout>
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -38,7 +39,7 @@
         android:orientation="vertical"
         android:paddingVertical="10mm">
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingHorizontal="10mm">
@@ -54,13 +55,13 @@
 
             <TextView
                 android:id="@+id/tv_content1"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:gravity="right"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="13sp" />
-        </RelativeLayout>
+        </LinearLayout>
 
         <RelativeLayout
             android:layout_width="match_parent"

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

@@ -111,5 +111,29 @@
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="13sp" />
         </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5mm"
+            android:paddingHorizontal="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10mm"
+                android:text="是否是我的工单:"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="13sp" />
+
+            <TextView
+                android:id="@+id/tv_is_me"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5mm"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="13sp" />
+        </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file