1.修改检修记录

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

@@ -7,6 +7,7 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.MesCheckFragment;
+import com.wd.workoffice.ui.fg.MesLubricatingFragment;
 import com.wd.workoffice.ui.fg.MesProcessFragment;
 import com.wd.workoffice.ui.fg.MesServiceFragment;
 
@@ -34,7 +35,7 @@ public class MesServiceActivity extends WorkToolBarActivity {
     private String tab[] = {
             "点检记录", "润滑记录", "检修记录"};
     private String order[] = {
-            "0", "1", "2", "3"};
+            "0", "1", "2"};
 
     @Override
     protected void initView() {
@@ -48,15 +49,11 @@ public class MesServiceActivity extends WorkToolBarActivity {
         FragmentManager sfm = getSupportFragmentManager();
         List<Fragment> data = new ArrayList<>();
         MesCheckFragment checkFragment = new MesCheckFragment();
+        MesLubricatingFragment lubricatingFragment = new MesLubricatingFragment();
+        MesServiceFragment serviceFragment = new MesServiceFragment();
         data.add(checkFragment);
-        for (int i = 0; i < tab.length-1; i++) {
-            MesServiceFragment saleFragment = new MesServiceFragment();
-            Bundle bundle = new Bundle();
-            bundle.putString("state", order[i]);
-            saleFragment.setArguments(bundle);
-            data.add(saleFragment);
-
-        }
+        data.add(lubricatingFragment);
+        data.add(serviceFragment);
         VpDataAdapter vpFgAdapter = new VpDataAdapter(sfm, data);
         vpData.setAdapter(vpFgAdapter);
         for (int i = 0; i < tab.length; i++) {

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

+package com.wd.workoffice.ui.fg;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.bigkoo.pickerview.listener.OnTimeSelectListener;
+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.ServiceBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.MesServiceAdapter;
+import com.wd.workoffice.util.PickTimeUtils;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import flexible.xd.android_base.utils.TimeUtils;
+import io.reactivex.disposables.Disposable;
+
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MesLubricatingFragment extends WorkBaseFg {
+
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    @BindView(R.id.tv_desc1)
+    TextView tvDesc1;
+    @BindView(R.id.tv_desc2)
+    TextView tvDesc2;
+    @BindView(R.id.tv_time)
+    TextView tvTime;
+    @BindView(R.id.ll_time)
+    LinearLayout llTime;
+    private int page = 1;
+    private Map<String, Object> param;
+    private MesServiceAdapter dataAdapter;
+    private List<ServiceBean.ListBean> dataList;
+    private Map<String, Object> paramMap;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this, getContentView());
+        tvDesc1.setText("点检单号");
+        tvDesc2.setText("检查人");
+        rvData.setLayoutManager(new LinearLayoutManager(getActivity(), RecyclerView.VERTICAL, false));
+    }
+
+
+    @Override
+    protected void initData() {
+        param = WorkUtils.pageMesKey();
+        page = 1;
+        param.put("pageNum", page);
+        paramMap = new HashMap<>();
+        param.put("paramMap", paramMap);
+        dataList = new ArrayList<>();
+        dataAdapter = new MesServiceAdapter(R.layout.item_mes_process, dataList);
+        dataAdapter.bindToRecyclerView(rvData);
+        dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
+        dataAdapter.notifyDataSetChanged();
+//        getData();
+    }
+
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Bundle arguments = getArguments();
+        if (arguments != null) {
+        }
+    }
+
+    private void getData() {
+        RtfUtils.getMesRtf().modinspoList("1", WorkUtils.convertMapToBody(param)).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<ServiceBean.ListBean> getList = JSON.parseObject(data.getData().toString(), ServiceBean.class).getList();
+                if (page == 1) {
+                    dataList.clear();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                    dataAdapter.loadMoreComplete();
+                } else {
+                    dataAdapter.loadMoreComplete();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                }
+                if (getList.size() == 0) {
+                    dataAdapter.loadMoreEnd();
+                } else {
+                    page++;
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        srlRefresh.setOnRefreshListener(refreshLayout -> {
+            page = 1;
+            param.put("pageNum", page);
+//            getData();
+        });
+        dataAdapter.setOnLoadMoreListener(() -> {
+            param.put("pageNum", page);
+//            getData();
+        }, rvData);
+        dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+//                startActivity(MesOrderDetailActivity.class);
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.fg_mes_process;
+    }
+
+    @OnClick(R.id.ll_time)
+    public void onViewClicked() {
+        PickTimeUtils.showPickThree(getActivity(), new OnTimeSelectListener() {
+            @Override
+            public void onTimeSelect(Date date, View view) {
+                tvTime.setText(TimeUtils.date2String(date,new SimpleDateFormat("yyyy-MM-dd")));
+                paramMap.put("createDateTime",TimeUtils.date2String(date,new SimpleDateFormat("yyyy-MM-dd")));
+                page = 1;
+                param.put("pageNum", page);
+                getData();
+            }
+        },false).show();
+    }
+}

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

@@ -32,8 +32,7 @@
 
             <ImageView
                 android:layout_width="20mm"
-                android:layout_height="12mm"
-                android:scaleType="fitXY"
+                android:layout_height="14mm"
                 android:src="@mipmap/mes_time_down" />
         </LinearLayout>