.封装基本对话框

.新增输入对话框
.新增粮情检查列表页
.新增粮情检查新增页

app/src/main/java/com/unis/sxzcl/ui/grain_check/DetailItemBean.java

@@ -0,0 +1,175 @@
+package com.unis.sxzcl.ui.grain_check;
+
+/**
+ * 包名: com.unis.sxzcl.ui.grain_check
+ * 类名: DetailItemBean
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2020/12/11 10:44
+ * 更新人:
+ * 更新时间: 2020/12/11 10:44
+ * 更新说明:
+ * 版本号: 1.0
+ */
+public class DetailItemBean {
+
+    /******************* 属性 *********************/
+
+    // 样式类型
+    private int itemType;
+    // 索引
+    private Integer index;
+    // id
+    private long id;
+    // 流程id
+    private long flowId;
+    // 标题
+    private String title;
+    // 时间
+    private String time;
+    // 选项集合
+    private String[] option;
+    // 选中项
+    private Integer selectIndex;
+    // 输入内容
+    private String inputData;
+    // 是否显示
+    private boolean show = true;
+    // 父选项id
+    private Long parentId;
+    // 子选项id集合 根据逗号分割
+    private long[] childIds;
+    // 必填
+    private boolean must;
+
+    /******************* 函数 *********************/
+
+    public DetailItemBean(@DetailItemType int itemType, long id, long flowId, String title) {
+        this.itemType = itemType;
+        this.id = id;
+        this.flowId = flowId;
+        this.title = title;
+    }
+
+
+    /******************* set方法 *********************/
+    public DetailItemBean setFlowId(long flowId) {
+        this.flowId = flowId;
+        return this;
+    }
+
+    public DetailItemBean setMust(boolean must) {
+        this.must = must;
+        return this;
+    }
+
+    public DetailItemBean setIndex(Integer index) {
+        this.index = index;
+        return this;
+    }
+
+    public DetailItemBean setItemType(int itemType) {
+        this.itemType = itemType;
+        return this;
+    }
+
+    public DetailItemBean setId(long id) {
+        this.id = id;
+        return this;
+    }
+
+    public DetailItemBean setTitle(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public DetailItemBean setTime(String time) {
+        this.time = time;
+        return this;
+    }
+
+    public DetailItemBean setOption(String[] option) {
+        this.option = option;
+        return this;
+    }
+
+    public DetailItemBean setSelectIndex(Integer selectIndex) {
+        this.selectIndex = selectIndex;
+        return this;
+    }
+
+    public DetailItemBean setInputData(String inputData) {
+        this.inputData = inputData;
+        return this;
+    }
+
+    public DetailItemBean setShow(boolean show) {
+        this.show = show;
+        return this;
+    }
+
+    public DetailItemBean setParentId(Long parentId) {
+        this.parentId = parentId;
+        return this;
+    }
+
+    public DetailItemBean setChildIds(long[] childIds) {
+        this.childIds = childIds;
+        return this;
+    }
+
+
+    /******************* get方法 *********************/
+
+    public Integer getIndex() {
+        return index;
+    }
+
+    public int getItemType() {
+        return itemType;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public String[] getOption() {
+        return option;
+    }
+
+    public Integer getSelectIndex() {
+        return selectIndex;
+    }
+
+    public String getInputData() {
+        return inputData;
+    }
+
+    public boolean isShow() {
+        return show;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public long[] getChildIds() {
+        return childIds;
+    }
+
+    public long getFlowId() {
+        return flowId;
+    }
+
+    public boolean isMust() {
+        return must;
+    }
+}

app/src/main/java/com/unis/sxzcl/ui/grain_check/DetailItemType.java

@@ -0,0 +1,28 @@
+package com.unis.sxzcl.ui.grain_check;
+
+import androidx.annotation.IntDef;
+
+/**
+ * 包名: com.unis.sxzcl.ui.grain_check
+ * 类名: DetailItemType
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2020/12/11 16:42
+ * 更新人:
+ * 更新时间: 2020/12/11 16:42
+ * 更新说明:
+ * 版本号: 1.0
+ */
+@IntDef({
+        DetailItemType.radio,
+        DetailItemType.input,
+})
+public @interface DetailItemType {
+
+    /******** 选项样式类型 *******/
+
+    // 单选
+    int radio = 1;
+    // 输入
+    int input = 2;
+}

app/src/main/java/com/unis/sxzcl/ui/grain_check/GrainCheckDetailAdapter.java

@@ -0,0 +1,216 @@
+package com.unis.sxzcl.ui.grain_check;
+
+import android.graphics.drawable.Drawable;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseProviderMultiAdapter;
+import com.chad.library.adapter.base.module.LoadMoreModule;
+import com.chad.library.adapter.base.provider.BaseItemProvider;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.unis.sxzcl.R;
+import com.unis.sxzcl.databinding.TemplateTvBinding;
+import com.unis.sxzcl.widget.dialog.InputDialog;
+import com.xyxsbj.mylibrary.tool.DateTool;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 包名: com.unis.sxzcl.ui.grain_check
+ * 类名: GrainCheckDetailAdapter
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2020/12/11 10:30
+ * 更新人:
+ * 更新时间: 2020/12/11 10:30
+ * 更新说明:
+ * 版本号: 1.0
+ */
+public class GrainCheckDetailAdapter extends BaseProviderMultiAdapter<DetailItemBean> implements LoadMoreModule {
+
+    private String pageType = "add";
+
+    public GrainCheckDetailAdapter() {
+        super();
+        //添加多布局
+        addItemProvider(new RadioProvider());
+        addItemProvider(new InputProvider());
+    }
+
+    @Override
+    protected int getItemType(@NotNull List<? extends DetailItemBean> list, int i) {
+        return list.get(i).getItemType();
+    }
+
+    public void setPageType(String pageType) {
+        if (pageType == null) return;
+        this.pageType = pageType;
+    }
+
+    /**
+     * 单选提供者
+     */
+    public class RadioProvider extends BaseItemProvider<DetailItemBean> {
+
+        private DetailItemBean currentItem;
+
+        @Override
+        public int getItemViewType() {
+            return DetailItemType.radio;
+        }
+
+        @Override
+        public int getLayoutId() {
+            return R.layout.item_detail_radio;
+        }
+
+        @Override
+        public void convert(@NotNull BaseViewHolder holder, DetailItemBean item) {
+            holder.getView(R.id.layout_container).setVisibility(item.isShow() ? View.VISIBLE : View.GONE);
+
+            // 标题
+            holder.setText(R.id.tv_title, item.getIndex() == null ? item.getTitle() : (item.getIndex() + "." + item.getTitle()));
+
+            // 选项创建
+            LinearLayout layoutOption = holder.getView(R.id.layout_option);
+            layoutOption.removeAllViews();
+            for (int i = 0; i < item.getOption().length; i++) {
+                layoutOption.addView(createdTextView(item, i));
+            }
+
+        }
+
+        /**
+         * 创建单选按钮
+         */
+        private TextView createdTextView(DetailItemBean item, int optionIndex) {
+            // 初始化 单选按钮
+            TextView textView = TemplateTvBinding.inflate(LayoutInflater.from(getContext())).getRoot();
+            textView.setText(item.getOption()[optionIndex]);
+            textView.setGravity(Gravity.CENTER_VERTICAL);
+            // 选中项一致 改变图标
+            if (item.getSelectIndex() != null && item.getSelectIndex() == optionIndex) {
+                Drawable dra = getContext().getResources().getDrawable(R.drawable.template_tv_left_sel_enable);
+                textView.setCompoundDrawablesWithIntrinsicBounds(dra, null, null, null);
+            } else {
+                Drawable dra = getContext().getResources().getDrawable(R.drawable.template_tv_left_enable);
+                textView.setCompoundDrawablesWithIntrinsicBounds(dra, null, null, null);
+            }
+            // 详情时禁用按钮和事件
+            if (pageType.equals("detail")) {
+                textView.setEnabled(true);
+                return textView;
+            }
+
+            textView.setTag(item);
+            textView.setOnClickListener(v -> {
+                // 单选点击事件
+                TextView tv = (TextView) v;
+                currentItem = (DetailItemBean) v.getTag();
+
+                // 得到所选值index
+                String[] option = currentItem.getOption();
+                int index = -1;
+                for (int i = 0; i < option.length; i++) {
+                    if (tv.getText().toString().equals(option[i])) {
+                        index = i;
+                        break;
+                    }
+                }
+                // 选中和历史一致不做任何操作
+                if (currentItem.getSelectIndex() != null && currentItem.getSelectIndex() == index)
+                    return;
+                // 存储选中index
+                currentItem.setSelectIndex(index);
+                // 存储选中时间
+                currentItem.setTime(DateTool.formatDate(new Date(), DateTool.YTDTD_DATE));
+
+                // 刷新当前项
+                notifyItemChanged(getItemPosition(currentItem));
+
+                // 处理其他业务
+                childShow();
+//                if (mCallback != null)
+//                    mCallback.onChangesListener(bean, index);
+            });
+            return textView;
+        }
+
+        private void childShow() {
+            // 关联子选项是否显示
+            long[] childIds = currentItem.getChildIds();
+            if (childIds == null) return;
+            boolean show = currentItem.getSelectIndex() == 0;
+            for (long cId : childIds) {
+                for (DetailItemBean item : getData()) {
+                    if (item.getId() == cId) {
+                        item.setShow(show);
+                        notifyItemChanged(getItemPosition(item));
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 输入提供者
+     */
+    public class InputProvider extends BaseItemProvider<DetailItemBean> {
+
+        private DetailItemBean currentItem;
+        private InputDialog mInputDialog;
+
+        @Override
+        public int getItemViewType() {
+            return DetailItemType.input;
+        }
+
+        @Override
+        public int getLayoutId() {
+            return R.layout.item_detail_input;
+        }
+
+        @Override
+        public void convert(@NotNull BaseViewHolder holder, DetailItemBean item) {
+            holder.getView(R.id.layout_container).setVisibility(item.isShow() ? View.VISIBLE : View.GONE);
+            holder.getView(R.id.tv_must).setVisibility(item.isMust() ? View.VISIBLE : View.GONE);
+
+            // 标题
+            holder.setText(R.id.tv_title, item.getIndex() == null ? item.getTitle() : (item.getIndex() + "." + item.getTitle()))
+                    .setText(R.id.tv_input, item.getInputData());
+
+
+            // 输入框点击事件
+            TextView tvContent = holder.getView(R.id.tv_input);
+            if (pageType.equals("detail")) {
+                tvContent.setHint("");
+                return;
+            }
+            tvContent.setOnClickListener(v -> {
+                currentItem = item;
+                showInputDialog();
+            });
+        }
+
+        private void showInputDialog() {
+            if (mInputDialog == null) {
+                mInputDialog = new InputDialog(getContext()).setCallBack((dialog, data) -> {
+                    dialog.dismiss();
+                    currentItem.setInputData(data);
+                    notifyItemChanged(getItemPosition(currentItem));
+                });
+            }
+            mInputDialog.show();
+            mInputDialog.getDialog().setTitle(currentItem.getTitle());
+            mInputDialog.setContent(currentItem.getInputData());
+        }
+    }
+
+}

app/src/main/java/com/unis/sxzcl/ui/grain_check/GrainCheckDetailFragment.java

@@ -0,0 +1,138 @@
+package com.unis.sxzcl.ui.grain_check;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.unis.sxzcl.base.BaseListFragment;
+import com.unis.sxzcl.databinding.FragmentAddBinding;
+import com.xyxsbj.mylibrary.tool.DPTool;
+import com.xyxsbj.mylibrary.tool.ToastTool;
+
+/**
+ * 包名: com.unis.sxzcl.ui.grain_check
+ * 类名: GrainCheckDetailFragment
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2020/12/11 9:55
+ * 更新人:
+ * 更新时间: 2020/12/11 9:55
+ * 更新说明:
+ * 版本号: 1.0
+ */
+public class GrainCheckDetailFragment extends BaseListFragment<FragmentAddBinding> {
+
+
+    private String mTab;
+    private String mPageType;
+    private GrainCheckDetailAdapter mAdapter;
+
+    @Override
+    protected FragmentAddBinding getViewBinding(LayoutInflater inflater, ViewGroup container) {
+        return FragmentAddBinding.inflate(inflater, container, false);
+    }
+
+    @Override
+    protected void init() {
+        Bundle bundle = getArguments();
+        if (bundle == null) {
+            ToastTool.showLong("没有参数");
+            onBack();
+            return;
+        }
+        mTab = bundle.getString("tab");
+        if (mTab == null) {
+            ToastTool.showLong("没有参数");
+            onBack();
+            return;
+        }
+        mBinding.bar.setTitle(mTab);
+
+        mPageType = bundle.getString("pageType", "add");
+        switch (mPageType) {
+            case "add":
+                // 新增
+                break;
+            case "edit":
+                // 修改
+                break;
+            case "detail":
+                // 详情
+                mBinding.tvSave.setVisibility(View.GONE);
+                mBinding.tvSubmit.setVisibility(View.GONE);
+                break;
+        }
+        mBinding.bar.setLeftClickListener(v -> onBack());
+
+        mAdapter = new GrainCheckDetailAdapter();
+        mAdapter.setPageType(mPageType);
+        TextView view = new TextView(getContext());
+        view.setHeight(DPTool.dp2px(getContext(), 200));
+        mAdapter.setFooterView(view);
+        initBaseListView(mBinding.refreshLayout, mBinding.recyclerView, mAdapter, false);
+    }
+
+    @Override
+    protected void onFirstShow() {
+        int flowId = 1;
+
+        mAdapter.addData(new DetailItemBean(DetailItemType.radio, 1, flowId, "打印粮温检测结果")
+                .setIndex(1)
+                .setOption(new String[]{"是", "否"}));
+        mAdapter.addData(new DetailItemBean(DetailItemType.radio, 2, flowId, "开灯")
+                .setIndex(2)
+                .setOption(new String[]{"是", "否"}));
+        mAdapter.addData(new DetailItemBean(DetailItemType.radio, 3, flowId, "双人进仓")
+                .setIndex(3)
+                .setOption(new String[]{"是", "否"}));
+        mAdapter.addData(new DetailItemBean(DetailItemType.radio, 4, flowId, "气体浓度是否达标(氧气、磷化氢)")
+                .setIndex(4)
+                .setOption(new String[]{"是", "否"}));
+        mAdapter.addData(new DetailItemBean(DetailItemType.radio, 5, flowId, "照明灯是否正常")
+                .setIndex(5)
+                .setOption(new String[]{"是", "否"}));
+        mAdapter.addData(new DetailItemBean(DetailItemType.radio, 6, flowId, "色泽、气味是否正常")
+                .setIndex(6)
+                .setOption(new String[]{"是", "否"}));
+        mAdapter.addData(new DetailItemBean(DetailItemType.radio, 7, flowId, "虫害情况")
+                .setIndex(7)
+                .setChildIds(new long[]{8, 9, 10, 11})
+                .setOption(new String[]{"是", "否"}));
+        mAdapter.addData(new DetailItemBean(DetailItemType.input, 8, flowId, "虫害密度").setShow(false).setMust(true));
+        mAdapter.addData(new DetailItemBean(DetailItemType.input, 9, flowId, "发生部位").setShow(false).setMust(true));
+        mAdapter.addData(new DetailItemBean(DetailItemType.input, 10, flowId, "虫害面积").setShow(false).setMust(true));
+        mAdapter.addData(new DetailItemBean(DetailItemType.input, 11, flowId, "虫害种类").setShow(false).setMust(true));
+        mAdapter.addData(new DetailItemBean(DetailItemType.radio, 12, flowId, "水分检测是否正常")
+                .setIndex(8)
+                .setOption(new String[]{"是", "否"}));
+        mAdapter.addData(new DetailItemBean(DetailItemType.radio, 13, flowId, "异常粮情")
+                .setIndex(9)
+                .setChildIds(new long[]{14})
+                .setOption(new String[]{"是", "否"}));
+        mAdapter.addData(new DetailItemBean(DetailItemType.input, 14, flowId, "异常情况描述").setShow(false));
+        mAdapter.addData(new DetailItemBean(DetailItemType.radio, 15, flowId, "锁门")
+                .setIndex(10)
+                .setOption(new String[]{"是", "否"}));
+        mAdapter.addData(new DetailItemBean(DetailItemType.radio, 16, flowId, "关灯")
+                .setIndex(11)
+                .setOption(new String[]{"是", "否"}));
+        mAdapter.addData(new DetailItemBean(DetailItemType.radio, 17, flowId, "粮情作业簿填写")
+                .setIndex(12)
+                .setOption(new String[]{"是", "否"}));
+        mAdapter.addData(new DetailItemBean(DetailItemType.radio, 18, flowId, "保管员日志填写")
+                .setIndex(13)
+                .setOption(new String[]{"是", "否"}));
+        mAdapter.addData(new DetailItemBean(DetailItemType.radio, 19, flowId, "粮情分析会")
+                .setIndex(14)
+                .setOption(new String[]{"是", "否"}));
+
+
+    }
+
+    @Override
+    public void onRefreshData() {
+        loadComplete();
+    }
+}

app/src/main/java/com/unis/sxzcl/ui/grain_check/GrainCheckHomeFragment.java

@@ -0,0 +1,92 @@
+package com.unis.sxzcl.ui.grain_check;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.fragment.app.Fragment;
+
+import com.google.android.material.tabs.TabLayout;
+import com.unis.model.HouseModel;
+import com.unis.model.bean.HouseBean;
+import com.unis.sxzcl.R;
+import com.unis.sxzcl.base.BaseFragment;
+import com.unis.sxzcl.databinding.FragmentBaseTabPagerBinding;
+import com.unis.sxzcl.widget.TabFragmentPagerAdapter;
+import com.xyxsbj.mylibrary.tool.ToastTool;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 包名: com.unis.sxzcl.ui.grain_check
+ * 类名: GrainCheckFragment
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2020/12/10 17:52
+ * 更新人:
+ * 更新时间: 2020/12/10 17:52
+ * 更新说明:
+ * 版本号: 1.0
+ */
+public class GrainCheckHomeFragment extends BaseFragment<FragmentBaseTabPagerBinding> {
+
+    public static final String BGY = "保管员每周检查粮情";
+    public static final String KZ = "主管科长每2周检查粮情";
+    public static final String FZJL = "分管副总每月检查粮情";
+    public static final String ZJL = "总经理每季检查粮情";
+
+    private List<String> mTabs = Arrays.asList(BGY, KZ, FZJL, ZJL);
+    private List<Fragment> mFragments;
+
+    @Override
+    protected FragmentBaseTabPagerBinding getViewBinding(LayoutInflater inflater, ViewGroup container) {
+        return FragmentBaseTabPagerBinding.inflate(inflater, container, false);
+    }
+
+    @Override
+    protected void init() {
+        HouseBean house = HouseModel.get().getSelectHouse();
+        if (house == null) {
+            ToastTool.showLong("未选择仓房");
+            onBack();
+            return;
+        }
+
+        mBinding.bar.setTitle("粮情检查(" + house.houseName + ")")
+                .setLeftClickListener(v -> onBack())
+                .setRightVisible(true).setRightText("新增")
+                .setRightClickListener(v -> goAdd());
+
+        initFragment();
+        mBinding.tabLayout.setTabMode(TabLayout.MODE_SCROLLABLE);
+        mBinding.tabLayout.setupWithViewPager(mBinding.viewPager);
+        TabFragmentPagerAdapter adapter = new TabFragmentPagerAdapter(
+                getChildFragmentManager(), mTabs, mFragments);
+        mBinding.viewPager.setAdapter(adapter);
+        mBinding.viewPager.setOffscreenPageLimit(mFragments.size());
+    }
+
+    private void initFragment() {
+        mFragments = new ArrayList<>();
+        for (String tab : mTabs) {
+            mFragments.add(GrainCheckListFragment.newFragment(tab));
+        }
+    }
+
+    @Override
+    protected void onFirstShow() {
+
+    }
+
+    /**
+     * 新增
+     */
+    private void goAdd() {
+        Bundle bundle = new Bundle();
+        bundle.putString("tab", mTabs.get(mBinding.viewPager.getCurrentItem()));
+        bundle.putString("pageType", "add");
+        navigation(R.id.grainCheckDetailFragment, bundle);
+    }
+}

app/src/main/java/com/unis/sxzcl/ui/grain_check/GrainCheckListAdapter.java

@@ -0,0 +1,61 @@
+package com.unis.sxzcl.ui.grain_check;
+
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.module.LoadMoreModule;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.unis.model.bean.GrainCheckBean;
+import com.unis.sxzcl.R;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * 包名: com.unis.sxzcl.ui.grain_check
+ * 类名: GrainCheckListAdapter
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2020/12/10 19:22
+ * 更新人:
+ * 更新时间: 2020/12/10 19:22
+ * 更新说明:
+ * 版本号: 1.0
+ */
+public class GrainCheckListAdapter extends BaseQuickAdapter<GrainCheckBean, BaseViewHolder>
+        implements LoadMoreModule {
+
+    public GrainCheckListAdapter() {
+        super(R.layout.item_list_grain_check);
+    }
+
+    @Override
+    protected void convert(@NotNull BaseViewHolder holder, GrainCheckBean item) {
+
+        holder.setText(R.id.tv_time, item.getTime());
+
+        ImageView imageView = holder.getView(R.id.iv_show);
+        TextView tvStatus = holder.getView(R.id.tv_status);
+        switch (item.getStatus()) {
+            case GrainCheckBean.STATUS
+                    .examine:
+                // 待审批
+                imageView.setImageResource(R.drawable.ic_wait_blue);
+                tvStatus.setText("待审批");
+                break;
+            case GrainCheckBean.STATUS
+                    .underway:
+                // 进行中
+                imageView.setImageResource(R.drawable.ic_wait_blue);
+                tvStatus.setText("进行中");
+                break;
+            case GrainCheckBean.STATUS
+                    .finish:
+                // 已完成
+                imageView.setImageResource(R.drawable.ic_finish_accent);
+                tvStatus.setText("已完成");
+                break;
+        }
+    }
+
+}

app/src/main/java/com/unis/sxzcl/ui/grain_check/GrainCheckListFragment.java

@@ -0,0 +1,101 @@
+package com.unis.sxzcl.ui.grain_check;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.listener.OnItemClickListener;
+import com.unis.model.bean.GrainCheckBean;
+import com.unis.sxzcl.R;
+import com.unis.sxzcl.base.BaseListFragment;
+import com.unis.sxzcl.databinding.FragmentBaseListBinding;
+
+/**
+ * 包名: com.unis.sxzcl.ui.grain_check
+ * 类名: GrainCheckListFragment
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2020/12/10 18:37
+ * 更新人:
+ * 更新时间: 2020/12/10 18:37
+ * 更新说明:
+ * 版本号: 1.0
+ */
+public class GrainCheckListFragment extends BaseListFragment<FragmentBaseListBinding> implements OnItemClickListener {
+
+    private GrainCheckListAdapter mAdapter;
+    private String mTab;
+
+    public static GrainCheckListFragment newFragment(String tab) {
+        Bundle bundle = new Bundle();
+        bundle.putString("tab", tab);
+        GrainCheckListFragment fragment = new GrainCheckListFragment();
+        fragment.setArguments(bundle);
+        return fragment;
+    }
+
+    @Override
+    protected FragmentBaseListBinding getViewBinding(LayoutInflater inflater, ViewGroup container) {
+        return FragmentBaseListBinding.inflate(inflater, container, false);
+    }
+
+    @Override
+    protected void init() {
+        Bundle bundle = getArguments();
+        mTab = bundle.getString("tab");
+
+        mAdapter = new GrainCheckListAdapter();
+        mAdapter.setOnItemClickListener(this);
+        initBaseListView(mBinding.refreshLayout, mBinding.recyclerView, mAdapter, true);
+    }
+
+    @Override
+    protected void onFirstShow() {
+        onRefresh();
+    }
+
+    @Override
+    public void onRefreshData() {
+        getData(true);
+    }
+
+    @Override
+    public void onMoreData() {
+        super.onMoreData();
+        getData(false);
+    }
+
+    public void getData(boolean refresh) {
+        new Handler().postDelayed(() -> {
+//            //大于30到结尾
+//            if (mAdapter.getData().size() == 20) {
+//                loadEnd();
+//                return;
+//            }
+            if (refresh) {
+                mAdapter.getData().clear();
+                mAdapter.notifyDataSetChanged();
+            }
+
+            //模拟数据
+            mAdapter.addData(new GrainCheckBean(GrainCheckBean.STATUS.underway, "2020-12-15 10:11"));
+            mAdapter.addData(new GrainCheckBean(GrainCheckBean.STATUS.finish, "2020-12-25 14:00"));
+
+            loadEnd();
+        }, 500);
+    }
+
+
+    @Override
+    public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
+        Bundle bundle = new Bundle();
+        bundle.putString("tab", mTab);
+        bundle.putString("pageType", "detail");
+        navigation(R.id.grainCheckDetailFragment, bundle);
+    }
+}

app/src/main/java/com/unis/sxzcl/ui/work_module/WorkModuleAdapter.java

@@ -8,6 +8,7 @@ import com.chad.library.adapter.base.module.LoadMoreModule;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.unis.model.BasicModel;
 import com.unis.model.DataCallBack;
+import com.unis.model.HouseModel;
 import com.unis.model.WorkbenchModel;
 import com.unis.model.bean.HouseBean;
 import com.unis.model.bean.WorkModule;
@@ -36,7 +37,8 @@ public class WorkModuleAdapter extends BaseQuickAdapter<WorkModule, BaseViewHold
     private ClickCallback mCallback;
     private BottomMultipleListDialog mListDialog;
     private List<MultipleBean> mMultipleList = new ArrayList<>();
-    private String currentHouseId;
+    private List<HouseBean> mHouseList = new ArrayList<>();
+
     private int currentFragmentId;
     private WorkModule currentWork;
 
@@ -46,8 +48,9 @@ public class WorkModuleAdapter extends BaseQuickAdapter<WorkModule, BaseViewHold
         BasicModel.get().getHouseList(new DataCallBack<List<HouseBean>>() {
             @Override
             public void onSuccess(List<HouseBean> data) {
+                mHouseList = data;
                 for (HouseBean bean : data) {
-                    mMultipleList.add(new MultipleBean(bean.houseName, bean.id + ""));
+                    mMultipleList.add(new MultipleBean(bean.houseName));
                 }
             }
         });
@@ -102,10 +105,11 @@ public class WorkModuleAdapter extends BaseQuickAdapter<WorkModule, BaseViewHold
                 break;
             case WorkbenchModel.TYPE_LQJC:
                 // 粮情检查
+                showHouseSelect(R.id.grainCheckHomeFragment);
                 break;
             case WorkbenchModel.TYPE_JXTF:
                 // 机械通风
-                showHouseSelect();
+                showHouseSelect(0);
                 break;
             case WorkbenchModel.TYPE_XZGL:
                 // 熏蒸管理
@@ -175,23 +179,27 @@ public class WorkModuleAdapter extends BaseQuickAdapter<WorkModule, BaseViewHold
     /**
      * 选择仓房
      */
-    private void showHouseSelect() {
+    private void showHouseSelect(int fragmentId) {
         if (mListDialog == null) {
             mListDialog = new BottomMultipleListDialog(getContext())
                     .hideTwoList()
                     .hideThreeList()
                     .hideRightEnter()
                     .setTitle("选择仓房")
-                    .setOneCallback((v, b1) -> {
-                        currentHouseId = b1.getExtras();
-                        next();
-
-                        return true;
-                    })
             ;
         }
         mListDialog.setListOne(mMultipleList)
                 .setSelectOne(-1)
+                .setOneCallback((v, b1) -> {
+                    currentFragmentId = fragmentId;
+                    //仓房点击事件
+                    int oneSelect = mListDialog.getOneSelect();
+                    if (oneSelect != -1)
+                        HouseModel.get().setSelectHouse(mHouseList.get(oneSelect));
+                    next();
+
+                    return true;
+                })
                 .show();
     }
 
@@ -203,12 +211,11 @@ public class WorkModuleAdapter extends BaseQuickAdapter<WorkModule, BaseViewHold
 
         // 回调给监听者
         if (mCallback != null)
-            mCallback.onClickListener(currentWork, currentFragmentId, currentHouseId);
+            mCallback.onClickListener(currentWork, currentFragmentId);
 
         // 清空存储内容
         currentWork = null;
         currentFragmentId = 0;
-        currentHouseId = null;
     }
 
     public void setCallback(ClickCallback callback) {
@@ -216,6 +223,6 @@ public class WorkModuleAdapter extends BaseQuickAdapter<WorkModule, BaseViewHold
     }
 
     public interface ClickCallback {
-        void onClickListener(WorkModule item, int fragmentId, String houseId);
+        void onClickListener(WorkModule item, int fragmentId);
     }
 }

app/src/main/java/com/unis/sxzcl/ui/work_module/WorkModuleFragment.java

@@ -148,10 +148,9 @@ public class WorkModuleFragment extends BaseListFragment<FragmentWorkModuleBindi
     }
 
     @Override
-    public void onClickListener(WorkModule item, int fragmentId, String houseId) {
+    public void onClickListener(WorkModule item, int fragmentId) {
         Bundle bundle = new Bundle();
         bundle.putString("data", getGson().toJson(item));
-        bundle.putString("houseId", houseId);
         navigation(fragmentId, bundle);
     }
 

app/src/main/java/com/unis/sxzcl/widget/BottomMultipleAdapter.java

@@ -73,6 +73,10 @@ public class BottomMultipleAdapter extends BaseQuickAdapter<MultipleBean, BaseVi
         if (mSelIndex >= 0) notifyItemChanged(mSelIndex);
     }
 
+    public int getSelIndex(){
+        return mSelIndex;
+    }
+
     /**
      * 获取已选中值
      *

app/src/main/java/com/unis/sxzcl/widget/BottomMultipleListDialog.java

@@ -188,6 +188,10 @@ public class BottomMultipleListDialog {
         return this;
     }
 
+    public int getOneSelect() {
+        return mAdapter1.getSelIndex();
+    }
+
     /**
      * 设置第二列选中项
      *
@@ -197,6 +201,9 @@ public class BottomMultipleListDialog {
         mAdapter2.setSelIndex(index);
         return this;
     }
+    public int getTwoSelect() {
+        return mAdapter2.getSelIndex();
+    }
 
     /**
      * 设置第三列选中项
@@ -207,6 +214,9 @@ public class BottomMultipleListDialog {
         mAdapter3.setSelIndex(index);
         return this;
     }
+    public int getThreeSelect() {
+        return mAdapter3.getSelIndex();
+    }
 
     public BottomMultipleListDialog hideTwoList() {
         mBinding.recyclerView2.setVisibility(View.GONE);

app/src/main/java/com/unis/sxzcl/widget/dialog/InputDialog.java

@@ -0,0 +1,121 @@
+package com.unis.sxzcl.widget.dialog;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import com.unis.sxzcl.R;
+import com.xyxsbj.mylibrary.tool.ETTool;
+import com.xyxsbj.mylibrary.tool.StringTool;
+
+/**
+ * 包名: com.unis.sxzcl.widget.dialog
+ * 类名: InputDialog
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2020/12/11 14:12
+ * 更新人:
+ * 更新时间: 2020/12/11 14:12
+ * 更新说明:
+ * 版本号: 1.0
+ */
+public class InputDialog {
+
+    Context mContext;
+    private SystemDialog mDialog;
+    private EditText mEtContent;
+    private TextView mBtnSubmit;
+
+    private CallBack mCallBack;
+
+    public InputDialog(@NonNull Context context) {
+        mContext = context;
+        initDialog();
+    }
+
+    /**
+     * 初始化对话框
+     */
+    private void initDialog() {
+        mDialog = new SystemDialog(mContext)
+                .setTitle("请输入内容")
+                .setContentView(getView())
+                .setOnShowListener(dialog -> {
+                    // 弹出软键盘
+                    ETTool.showSoftKeyboard(mEtContent);
+                })
+                .setDismissListener(dialog -> {
+                    // 隐藏软键盘
+                    ETTool.closeSoftKeybord(mEtContent);
+                });
+
+    }
+
+    /**
+     * 获取自定义布局
+     */
+    private View getView() {
+        View view = LayoutInflater.from(mContext).inflate(R.layout.dialog_input, null, false);
+        mEtContent = view.findViewById(R.id.et_content);
+
+        mBtnSubmit = view.findViewById(R.id.btn_submit);
+        mBtnSubmit.setOnClickListener(v -> {
+
+            String phone = ETTool.getData(mEtContent);
+            if (StringTool.isEmpty(phone)) {
+                mEtContent.setError("请输入内容");
+                return;
+            }
+            if (mCallBack != null)
+                mCallBack.onSubmitListener(mDialog, phone);
+        });
+        return view;
+    }
+
+
+    public InputDialog setContent(String content) {
+        mEtContent.setText(content);
+        return this;
+    }
+
+    /**
+     * 设置提交监听事件
+     */
+    public InputDialog setCallBack(CallBack callBack) {
+        mCallBack = callBack;
+        return this;
+    }
+
+    /**
+     * 显示对话框
+     */
+    public InputDialog show() {
+        mDialog.show();
+        return this;
+    }
+
+    /**
+     * 隐藏对话框
+     */
+    public InputDialog dismiss() {
+        mDialog.dismiss();
+        return this;
+    }
+
+    /**
+     * 获取对话框
+     *
+     * @return
+     */
+    public SystemDialog getDialog() {
+        return mDialog;
+    }
+
+    public interface CallBack {
+        public void onSubmitListener(SystemDialog dialog, String data);
+    }
+}

app/src/main/java/com/unis/sxzcl/widget/dialog/SystemDialog.java

@@ -0,0 +1,255 @@
+package com.unis.sxzcl.widget.dialog;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.unis.sxzcl.R;
+
+
+/**
+ * 创建人 mQ
+ * 创建时间 2019/7/23 0023 20:22
+ * 文件名称 SystemDialog
+ * 说明:  系统提示对话框
+ **/
+public class SystemDialog {
+
+    AlertDialog mDialog;
+
+    private TextView mTvTitle;
+    private ImageView mBtnClose;
+    private TextView mTvMsg;
+    private FrameLayout mContentLayout;
+    private View mViewBottomLine;
+    private TextView mBtnLeft;
+    private TextView mBtnCenter;
+    private TextView mBtnRight;
+    private LinearLayout mRootLayout;
+
+    private LeftCallBack mLeftCallBack;
+    private CenterCallBack mCenterCallBack;
+    private RightCallBack mRightCallBack;
+
+
+    public SystemDialog(Context context) {
+        initDialog(context);
+    }
+
+
+    private void initDialog(Context context) {
+        mDialog = new AlertDialog.Builder(context, R.style.MyDialog).create();
+        View view = LayoutInflater.from(context).inflate(R.layout.dialog_system, null, false);
+        mDialog.setView(view);
+        mDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
+        mDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        initView(view);
+    }
+
+    private void initView(View view) {
+        mTvTitle = view.findViewById(R.id.tv_title);
+        mTvTitle.setText("");
+
+        mBtnClose = view.findViewById(R.id.btn_close);
+        mBtnClose.setOnClickListener(mClickListener);
+
+        mTvMsg = view.findViewById(R.id.tv_msg);
+        mTvMsg.setVisibility(View.GONE);
+
+        mContentLayout = view.findViewById(R.id.content_layout);
+        mContentLayout.setVisibility(View.GONE);
+
+        mViewBottomLine = view.findViewById(R.id.view_bottom_line);
+        mViewBottomLine.setVisibility(View.GONE);
+
+
+        mBtnLeft = view.findViewById(R.id.btn_left);
+        mBtnLeft.setOnClickListener(mClickListener);
+        mBtnLeft.setVisibility(View.GONE);
+
+        mBtnCenter = view.findViewById(R.id.btn_center);
+        mBtnCenter.setOnClickListener(mClickListener);
+        mBtnCenter.setVisibility(View.GONE);
+
+        mBtnRight = view.findViewById(R.id.btn_right);
+        mBtnRight.setOnClickListener(mClickListener);
+        mBtnRight.setVisibility(View.GONE);
+
+        mRootLayout = view.findViewById(R.id.root_layout);
+        mRootLayout.setOnClickListener(mClickListener);
+    }
+
+    private View.OnClickListener mClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            switch (v.getId()) {
+                case R.id.btn_close:
+                    //关闭
+                    dismiss();
+                    break;
+                case R.id.btn_left:
+                    //左侧按钮点击
+                    if (mLeftCallBack == null)
+                        dismiss();
+                    else
+                        mLeftCallBack.onLeftListener(SystemDialog.this);
+                    break;
+                case R.id.btn_center:
+                    //中间按钮点击
+                    if (mCenterCallBack == null)
+                        dismiss();
+                    else
+                        mCenterCallBack.onCenterListener(SystemDialog.this);
+                    break;
+                case R.id.btn_right:
+                    //右侧按钮点击
+                    if (mRightCallBack == null)
+                        dismiss();
+                    else
+                        mRightCallBack.onRightListener(SystemDialog.this);
+                    break;
+                case R.id.root_layout:
+                    //空白处点击
+//                    if (mBtnClose.getVisibility() == View.VISIBLE) {
+//                        dismiss();
+//                    }
+                    break;
+            }
+        }
+    };
+
+    /**
+     * 设置标题
+     *
+     * @param title
+     * @return
+     */
+    public SystemDialog setTitle(String title) {
+        mTvTitle.setText(title);
+        return this;
+    }
+
+    /**
+     * 设置内容
+     *
+     * @param msg
+     */
+    public SystemDialog setMsg(String msg) {
+        mTvMsg.setVisibility(View.VISIBLE);
+        mTvMsg.setText(msg);
+        return this;
+    }
+
+    /**
+     * 设置左侧按钮
+     *
+     * @param left
+     * @param leftCallBack
+     * @return
+     */
+    public SystemDialog setLeftButton(String left, LeftCallBack leftCallBack) {
+        mViewBottomLine.setVisibility(View.VISIBLE);
+        mBtnLeft.setVisibility(View.VISIBLE);
+        mBtnLeft.setText(left);
+        mLeftCallBack = leftCallBack;
+        return this;
+    }
+
+    /**
+     * 设置中间按钮
+     *
+     * @param center
+     * @param centerCallBack
+     * @return
+     */
+    public SystemDialog setCenterButton(String center, CenterCallBack centerCallBack) {
+        mBtnCenter.setVisibility(View.VISIBLE);
+        mBtnCenter.setText(center);
+        mCenterCallBack = centerCallBack;
+        return this;
+    }
+
+    /**
+     * 设置右侧按钮
+     *
+     * @param right
+     * @param rightCallBack
+     * @return
+     */
+    public SystemDialog setRightButton(String right, RightCallBack rightCallBack) {
+        mBtnRight.setVisibility(View.VISIBLE);
+        mBtnRight.setText(right);
+        mRightCallBack = rightCallBack;
+        return this;
+    }
+
+    /**
+     * 设置内容布局
+     *
+     * @param contentView
+     * @return
+     */
+    public SystemDialog setContentView(View contentView) {
+        mContentLayout.setVisibility(View.VISIBLE);
+        mContentLayout.addView(contentView);
+        return this;
+    }
+
+    public SystemDialog setCancelable(boolean cancelable) {
+        mDialog.setCancelable(cancelable);
+        return this;
+    }
+
+    public SystemDialog setHideClose() {
+        mBtnClose.setVisibility(View.GONE);
+        return this;
+    }
+
+    public SystemDialog setHideTitle() {
+        mTvTitle.setVisibility(View.GONE);
+        return this;
+    }
+
+    public SystemDialog setDismissListener(DialogInterface.OnDismissListener dismissListener) {
+        mDialog.setOnDismissListener(dismissListener);
+        return this;
+    }
+
+    public SystemDialog setOnShowListener(DialogInterface.OnShowListener listener) {
+        mDialog.setOnShowListener(listener);
+        return this;
+    }
+
+    public void show() {
+        mDialog.show();
+    }
+
+
+    public void dismiss() {
+        mDialog.dismiss();
+    }
+
+    public AlertDialog getDialog() {
+        return mDialog;
+    }
+
+    public interface LeftCallBack {
+        public void onLeftListener(SystemDialog dialog);
+    }
+
+    public interface CenterCallBack {
+        public void onCenterListener(SystemDialog dialog);
+    }
+
+    public interface RightCallBack {
+        public void onRightListener(SystemDialog dialog);
+    }
+}

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:background="@color/colorWhite"
+    android:minWidth="800dp"
+    android:orientation="vertical">
+
+
+    <EditText
+        android:id="@+id/et_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginRight="8dp"
+        android:background="@drawable/gray_radius_bg"
+        android:gravity="center_vertical"
+        android:hint="请输入"
+        android:paddingLeft="8dp"
+        android:paddingTop="8dp"
+        android:paddingRight="8dp"
+        android:paddingBottom="8dp"
+        android:textColor="@color/colorTextBlack"
+        android:textSize="?attr/textSizeXXX" />
+
+    <TextView
+        android:id="@+id/btn_submit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="24dp"
+        android:background="@drawable/accent_radius_bg"
+        android:paddingLeft="24dp"
+        android:paddingTop="8dp"
+        android:paddingRight="24dp"
+        android:paddingBottom="8dp"
+        android:text="确定"
+        android:textColor="@color/colorWhite"
+        android:textSize="?attr/textSizeXXX" />
+
+</LinearLayout>

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

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/root_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:orientation="vertical">
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="8dp">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/tv_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    android:background="@drawable/window_background"
+                    android:gravity="center"
+                    android:text="标题"
+                    android:textColor="@color/colorWhite"
+                    android:textSize="?attr/textSizeXXX" />
+
+                <ImageView
+                    android:id="@+id/btn_close"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="8dp"
+                    android:foreground="?android:selectableItemBackground"
+                    android:src="@drawable/ic_clear_white" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/tv_msg"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:minWidth="250dp"
+                android:minHeight="88dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:text="文字内容"
+                android:textColor="@color/colorTextBlack" />
+
+            <FrameLayout
+                android:id="@+id/content_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:minWidth="250dp" />
+
+            <View
+                android:id="@+id/view_bottom_line"
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="@color/colorLine" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/btn_left"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
+                    android:layout_weight="1"
+                    android:foreground="?android:selectableItemBackground"
+                    android:gravity="center"
+                    android:text="左按钮"
+                    android:textColor="@color/colorText1" />
+
+                <TextView
+                    android:id="@+id/btn_center"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
+                    android:layout_weight="1"
+                    android:background="@color/colorBlue"
+                    android:foreground="?android:selectableItemBackground"
+                    android:gravity="center"
+                    android:text="中按钮"
+                    android:textColor="@color/colorWhite" />
+
+                <TextView
+                    android:id="@+id/btn_right"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
+                    android:layout_weight="1"
+                    android:background="@color/colorTheme"
+                    android:foreground="?android:selectableItemBackground"
+                    android:gravity="center"
+                    android:text="右按钮"
+                    android:textColor="@color/colorWhite" />
+            </LinearLayout>
+
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
+
+</LinearLayout>

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

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.unis.sxzcl.widget.BaseTitleBar
+        android:id="@+id/bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:barTitle="列表" />
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/refresh_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/bar">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scrollbars="vertical" />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    <LinearLayout
+        android:id="@+id/layout_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_save"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="24dp"
+            android:background="@drawable/accent_circle_bg"
+            android:gravity="center"
+            android:minHeight="48dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:text="暂存"
+            android:textColor="@color/colorWhite"
+            android:textSize="?attr/textSizeXXX" />
+
+        <TextView
+            android:id="@+id/tv_submit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="24dp"
+            android:background="@drawable/accent_circle_bg"
+            android:gravity="center"
+            android:minHeight="48dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:text="提交"
+            android:visibility="gone"
+            android:textColor="@color/colorWhite"
+            android:textSize="?attr/textSizeXXX" />
+    </LinearLayout>
+
+</RelativeLayout>

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

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:id="@+id/layout_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorWhite"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
+
+        <TextView
+            android:id="@+id/tv_must"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginRight="4dp"
+            android:layout_marginBottom="16dp"
+            android:text="*"
+            android:textColor="@color/colorRed"
+            android:textSize="?attr/textSizeXXX" />
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="16dp"
+            android:text="标题文本"
+            android:textColor="@color/colorTextBlack"
+            android:textSize="?attr/textSizeXXX" />
+
+        <TextView
+            android:id="@+id/tv_input"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="16dp"
+            android:background="@drawable/accent_radius_stroke_bg"
+            android:hint="请输入"
+            android:padding="8dp"
+            android:textColor="@color/colorTheme"
+            android:textSize="?attr/textSizeXXX" />
+    </LinearLayout>
+
+
+</FrameLayout>

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

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:id="@+id/layout_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorWhite"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginRight="16dp"
+            android:text="1.标题文本:"
+            android:textColor="@color/colorTextBlack"
+            android:textSize="?attr/textSizeXXX" />
+
+        <LinearLayout
+            android:id="@+id/layout_option"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="8dp"
+            android:orientation="vertical">
+
+        </LinearLayout>
+    </LinearLayout>
+
+
+</FrameLayout>

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

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/colorWhite"
+    android:foreground="?android:selectableItemBackground"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:paddingLeft="16dp"
+        android:paddingTop="16dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="16dp">
+
+        <ImageView
+            android:id="@+id/iv_show"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="8dp"
+            android:src="@drawable/ic_finish_accent" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="进行中"
+                android:textColor="@color/colorTextBlack"
+                android:textSize="?attr/textSizeXXX" />
+
+            <TextView
+                android:id="@+id/tv_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="2020-12-12 12:12"
+                android:textColor="@color/colorTextAccent"
+                android:textSize="?attr/textSizeXX" />
+        </LinearLayout>
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:src="@drawable/ic_next_normal" />
+    </LinearLayout>
+
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/colorLine" />
+</LinearLayout>

app/src/main/res/navigation/nav_graph.xml

@@ -7,7 +7,7 @@
     <fragment
         android:id="@+id/mainFragment"
         android:name="com.unis.sxzcl.ui.home.MainFragment"
-        android:label="MainFragment" >
+        android:label="首页">
         <action
             android:id="@+id/action_mainFragment_to_companyStatsFragment"
             app:destination="@id/companyStatsFragment" />
@@ -119,6 +119,9 @@
         <action
             android:id="@+id/action_workModuleFragment_to_houseHomeFragment"
             app:destination="@id/houseHomeFragment" />
+        <action
+            android:id="@+id/action_workModuleFragment_to_grainCheckFragment"
+            app:destination="@id/grainCheckHomeFragment" />
     </fragment>
     <fragment
         android:id="@+id/exampleFragment"
@@ -139,7 +142,19 @@
     <fragment
         android:id="@+id/houseHomeFragment"
         android:name="com.unis.sxzcl.ui.house.HouseHomeFragment"
-        android:label="HouseHomeFragment" />
+        android:label="仓房信息" />
+    <fragment
+        android:id="@+id/grainCheckHomeFragment"
+        android:name="com.unis.sxzcl.ui.grain_check.GrainCheckHomeFragment"
+        android:label="粮情检查" >
+        <action
+            android:id="@+id/action_grainCheckHomeFragment_to_grainCheckDetailFragment"
+            app:destination="@id/grainCheckDetailFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/grainCheckDetailFragment"
+        android:name="com.unis.sxzcl.ui.grain_check.GrainCheckDetailFragment"
+        android:label="GrainCheckDetailFragment" />
 
 
 </navigation>

app/src/main/res/values/styles.xml

@@ -1,5 +1,22 @@
 <resources>
 
+    <style name="MyDialog" parent="Theme.AppCompat.Dialog">
+        <!--背景颜色和透明程度-->
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <!--是否去除标题-->
+        <item name="android:windowNoTitle">true</item>
+        <!--是否去除边框-->
+        <item name="android:windowFrame">@null</item>
+        <!--是否浮现在activity之上-->
+        <item name="android:windowIsFloating">true</item>
+        <!--是否模糊-->
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+
+    </style>
+
     <style name="main_tab_layout">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">match_parent</item>

icon/src/main/res/drawable/ic_clear_white.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorWhite"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+</vector>

icon/src/main/res/drawable/ic_finish_accent.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="@color/colorAccent"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
+</vector>

icon/src/main/res/drawable/ic_wait_blue.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="@color/colorBlue"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10S17.5,2 12,2zM15.55,15.8l-4.08,-2.51c-0.3,-0.18 -0.48,-0.5 -0.48,-0.85V7.75C11,7.34 11.34,7 11.75,7s0.75,0.34 0.75,0.75v4.45l3.84,2.31c0.36,0.22 0.48,0.69 0.26,1.05C16.38,15.91 15.91,16.02 15.55,15.8z" />
+</vector>

model/src/main/java/com/unis/model/Constant.java

@@ -41,5 +41,7 @@ public class Constant {
 
     //所选公司
     public static final String KEY_SELECT_COMPANY = "select_company";
+    //所选仓房
+    public static final String KEY_SELECT_HOUSE = "select_house";
 
 }

model/src/main/java/com/unis/model/HouseModel.java

@@ -0,0 +1,49 @@
+package com.unis.model;
+
+import com.google.gson.Gson;
+import com.unis.model.bean.HouseBean;
+import com.xyxsbj.mylibrary.tool.SPTool;
+
+/**
+ * 包名: com.unis.model
+ * 类名: UserModel
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2020/11/25 15:55
+ * 更新人:
+ * 更新时间: 2020/11/25 15:55
+ * 更新说明:
+ * 版本号: 1.0
+ */
+public class HouseModel {
+    private HouseModel() {
+    }
+
+    private static class SingleHolder {
+        private static final HouseModel INSTANCE = new HouseModel();
+    }
+
+    public static HouseModel get() {
+        return SingleHolder.INSTANCE;
+    }
+
+
+    /**
+     * 存储选择的仓房
+     */
+    public void setSelectHouse(HouseBean bean) {
+        String houseJson = new Gson().toJson(bean);
+        SPTool.saveString(Constant.KEY_SELECT_HOUSE, houseJson);
+    }
+
+    /**
+     * 获取选择的仓房
+     */
+    public HouseBean getSelectHouse() {
+        String houseJson = SPTool.getString(Constant.KEY_SELECT_HOUSE, null);
+        if (houseJson == null)
+            return null;
+        return new Gson().fromJson(houseJson, HouseBean.class);
+    }
+
+}

model/src/main/java/com/unis/model/UrlPath.java

@@ -14,7 +14,10 @@ package com.unis.model;
 public class UrlPath {
 
     //服务器地址
-    public static final String host = "http://10.10.1.25:9099/";
+    public static final String host = "http://10.10.1.25:9066/";
+    // vpn
+//    public static final String host = "http://172.16.0.46:9603/";
+
     //图片地址
     public static final String image_host = host + "csc-szls-system-manage/minio/preViewPicture/";
 

model/src/main/java/com/unis/model/bean/GrainCheckBean.java

@@ -0,0 +1,60 @@
+package com.unis.model.bean;
+
+import androidx.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * 包名: com.unis.model.bean
+ * 类名: GrainCheckBean
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2020/12/10 19:21
+ * 更新人:
+ * 更新时间: 2020/12/10 19:21
+ * 更新说明:
+ * 版本号: 1.0
+ */
+public class GrainCheckBean {
+
+    @IntDef({
+            STATUS.examine,
+            STATUS.underway,
+            STATUS.finish,
+    })
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface STATUS {
+        // 审批中
+        int examine = 0;
+        // 进行中
+        int underway = 1;
+        // 已完成
+        int finish = 2;
+    }
+
+
+    private int status;
+    private String time;
+
+    public GrainCheckBean(@STATUS int status, String time) {
+        this.status = status;
+        this.time = time;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+}

mylibrary/src/main/java/com/xyxsbj/mylibrary/tool/ETTool.java

@@ -128,10 +128,16 @@ public class ETTool {
      */
     public static void showSoftKeyboard(EditText view) {
         try {
-            if (view.requestFocus()) {
+            // 设置可获得焦点
+            view.setFocusable(true);
+            view.setFocusableInTouchMode(true);
+            // 请求获得焦点
+            view.requestFocus();
+//            if (view.requestFocus()) {
+                // 调用系统输入法
                 InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
-            }
+                imm.showSoftInput(view, 0);
+//            }
         } catch (Exception e) {
 
         }