1.修改基类逻辑

2.增加机械通风页标题切换仓房
3.增加粮情检查页标题切换仓房
4.待办和机械通风字段修改
5.机械通风非本人查看时只显示已填流程

app/src/main/java/com/unis/sxzcl/base/BaseFragment.java

@@ -289,7 +289,7 @@ public abstract class BaseFragment<T extends ViewBinding> extends Fragment {
     private boolean isVisibleToUser = true;
 
     //第一次加载
-    private boolean isFirstLoad = true;
+    public boolean isFirstLoad = true;
 
     @Override
     public void onHiddenChanged(boolean hidden) {

app/src/main/java/com/unis/sxzcl/ui/aeration/AerationDetailFragment.java

@@ -101,6 +101,10 @@ public class AerationDetailFragment extends BaseListFragment<FragmentAerationDet
         // 流程列表
         mStepAdapter = new AerationStepAdapter();
         mStepAdapter.setPageType(mPageType);
+        if (mPageType.equals("detail") && !mBean.getAuditState().equals("4")) {
+            // 流程如果未走完 进度改为可编辑
+            mStepAdapter.setPageType("edit");
+        }
         mStepAdapter.setSwitchCallback(this);
 //        mStepAdapter.setMaxClickIndex(2);
         mBinding.recyclerViewStep.setAdapter(mStepAdapter);
@@ -215,7 +219,7 @@ public class AerationDetailFragment extends BaseListFragment<FragmentAerationDet
                 }
 
                 // 查看详情时 不控制流程 全部显示
-                if (mPageType.equals("detail"))
+                if (mPageType.equals("detail") && mBean.getAuditState().equals("4"))
                     mAdapter.setFlowId(null);
 
                 loadComplete();
@@ -475,6 +479,8 @@ public class AerationDetailFragment extends BaseListFragment<FragmentAerationDet
         if (index == -1) {
             mAdapter.setFlowId(null);
         } else {
+            if (index > mStepAdapter.getData().size() - 1)
+                index = mStepAdapter.getData().size() - 1;
             String id = mStepAdapter.getData().get(index).id;
             mAdapter.setFlowId(id);
         }

app/src/main/java/com/unis/sxzcl/ui/aeration/AerationListFragment.java

@@ -4,17 +4,22 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
+import androidx.core.content.ContextCompat;
+
 import com.google.gson.Gson;
 import com.unis.model.DataCallback;
+import com.unis.model.DepotModel;
 import com.unis.model.HouseModel;
 import com.unis.model.ProcessModel;
 import com.unis.model.UserModel;
 import com.unis.model.bean.HouseListBean;
+import com.unis.model.bean.MultiDepotBean;
 import com.unis.model.bean.aeration.AerationBean;
 import com.unis.model.event.AerationEvent;
 import com.unis.sxzcl.R;
 import com.unis.sxzcl.base.BaseListFragment;
 import com.unis.sxzcl.databinding.FragmentBaseListTitleBinding;
+import com.unis.sxzcl.ui.house.SelectHouseDialog;
 import com.xyxsbj.mylibrary.tool.ToastTool;
 
 import org.greenrobot.eventbus.EventBus;
@@ -37,6 +42,7 @@ public class AerationListFragment extends BaseListFragment<FragmentBaseListTitle
 
 
     private AerationListAdapter mAdapter;
+    private SelectHouseDialog mHouseDialog;
 
     @Override
     protected FragmentBaseListTitleBinding getViewBinding(LayoutInflater inflater, ViewGroup container) {
@@ -54,9 +60,17 @@ public class AerationListFragment extends BaseListFragment<FragmentBaseListTitle
         }
 
         mBinding.bar.setTitle("机械通风(" + house.houseName + ")")
+                .setTitleRightDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_down_white))
+                .setTitleClickListener(v -> {
+                    // 点击标题选择仓房
+                    showHouseSelect();
+                })
                 .setLeftClickListener(v -> onBack())
                 .setRightVisible(true).setRightText("新增")
-                .setRightClickListener(v -> goAdd());
+                .setRightClickListener(v -> {
+                    // 新增
+                    goAdd();
+                });
 
         mAdapter = new AerationListAdapter();
         mAdapter.setCallback(this);
@@ -145,6 +159,30 @@ public class AerationListFragment extends BaseListFragment<FragmentBaseListTitle
     }
 
 
+    /**
+     * 选择仓房
+     */
+    private void showHouseSelect() {
+        MultiDepotBean depot = DepotModel.get().getSelectDepot();
+        if (depot == null) {
+            ToastTool.showLong("请先选择库");
+            return;
+        }
+
+        if (mHouseDialog == null)
+            mHouseDialog = new SelectHouseDialog(getContext());
+        // 监听仓房选择结果
+        mHouseDialog.setCallback(bean -> {
+            if (bean == null)
+                return;
+            mBinding.bar.setTitle("机械通风(" + bean.houseName + ")");
+            onRefresh();
+        });
+        // 弹出仓房选择对话框
+        mHouseDialog.show(depot.depotCode, -1);
+    }
+
+
     @Subscribe
     public void onEvent(AerationEvent event) {
         onRefresh();

app/src/main/java/com/unis/sxzcl/ui/announce/AnnounceListAdapter.java

@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.module.LoadMoreModule;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.unis.model.bean.AnnounceBean;
 import com.unis.sxzcl.R;
+import com.xyxsbj.mylibrary.tool.DateTool;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -43,7 +44,10 @@ public class AnnounceListAdapter extends BaseQuickAdapter<AnnounceBean, BaseView
         tvContent.setText(Html.fromHtml(content, null, null));
 
         holder.setText(R.id.tv_source, item.getPublishOrgName());
-        holder.setText(R.id.tv_time, item.getPublishTime());
+
+        String publishTime = item.getPublishTime();
+        DateTool.formatDate(publishTime, DateTool.GLNZSJ_DATE, DateTool.YTDTD_DATE);
+        holder.setText(R.id.tv_time, publishTime);
 
         //未读标记的显示/隐藏
         boolean state = item.getReadStatus() == null ? false : item.getReadStatus();

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

@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
 import com.google.android.material.tabs.TabLayout;
@@ -13,11 +14,13 @@ import com.unis.model.GrainCheckModel;
 import com.unis.model.HouseModel;
 import com.unis.model.UserModel;
 import com.unis.model.bean.HouseListBean;
+import com.unis.model.bean.MultiDepotBean;
 import com.unis.model.bean.grain_check.GrainCheckBean;
 import com.unis.model.event.GrainCheckEvent;
 import com.unis.sxzcl.R;
 import com.unis.sxzcl.base.BaseFragment;
 import com.unis.sxzcl.databinding.FragmentBaseTabPagerBinding;
+import com.unis.sxzcl.ui.house.SelectHouseDialog;
 import com.unis.sxzcl.widget.TabFragmentPagerAdapter;
 import com.unis.sxzcl.widget.dialog.SystemDialog;
 import com.xyxsbj.mylibrary.tool.DateTool;
@@ -52,6 +55,8 @@ public class GrainCheckHomeFragment extends BaseFragment<FragmentBaseTabPagerBin
     private List<Fragment> mFragments;
     private SystemDialog mSystemDialog;
 
+    private SelectHouseDialog mHouseDialog;
+
     @Override
     protected FragmentBaseTabPagerBinding getViewBinding(LayoutInflater inflater, ViewGroup container) {
         return FragmentBaseTabPagerBinding.inflate(inflater, container, false);
@@ -67,6 +72,11 @@ public class GrainCheckHomeFragment extends BaseFragment<FragmentBaseTabPagerBin
         }
 
         mBinding.bar.setTitle("粮情检查(" + house.houseName + ")")
+                .setTitleRightDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_down_white))
+                .setTitleClickListener(v -> {
+                    // 点击标题选择仓房
+                    showHouseSelect();
+                })
                 .setLeftClickListener(v -> onBack())
                 .setRightVisible(true).setRightText("新增")
                 .setRightClickListener(v -> goAdd());
@@ -148,5 +158,28 @@ public class GrainCheckHomeFragment extends BaseFragment<FragmentBaseTabPagerBin
                 }).show();
     }
 
+    /**
+     * 选择仓房
+     */
+    private void showHouseSelect() {
+        MultiDepotBean depot = DepotModel.get().getSelectDepot();
+        if (depot == null) {
+            ToastTool.showLong("请先选择库");
+            return;
+        }
+
+        if (mHouseDialog == null)
+            mHouseDialog = new SelectHouseDialog(getContext());
+        // 监听仓房选择结果
+        mHouseDialog.setCallback(bean -> {
+            if (bean == null)
+                return;
+            mBinding.bar.setTitle("粮情检查(" + bean.houseName + ")");
+            EventBus.getDefault().post(new GrainCheckEvent(null));
+        });
+        // 弹出仓房选择对话框
+        mHouseDialog.show(depot.depotCode, -1);
+    }
+
 
 }

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

@@ -37,8 +37,6 @@ public class GrainCheckListFragment extends BaseListFragment<FragmentBaseListBin
     private GrainCheckListAdapter mAdapter;
     private String mTab;
     private Integer mUid;
-    private Integer mDepotId;
-    private Integer mHouseId;
 
     public static GrainCheckListFragment newFragment(String tab) {
         Bundle bundle = new Bundle();
@@ -73,9 +71,6 @@ public class GrainCheckListFragment extends BaseListFragment<FragmentBaseListBin
     @Override
     protected void onFirstShow() {
         mUid = UserModel.get().getUser().getUid();
-        mDepotId = DepotModel.get().getSelectDepot().depotCode;
-        String houseCode = HouseModel.get().getSelectHouse().houseCode;
-        mHouseId = houseCode != null ? Integer.valueOf(houseCode) : null;
 
         onRefresh();
     }
@@ -99,10 +94,10 @@ public class GrainCheckListFragment extends BaseListFragment<FragmentBaseListBin
         else
             page++;
 
-        GrainCheckModel.get().getList(mTab, page, mUid, mDepotId, mHouseId, new DataCallback<List<GrainCheckBean>>() {
+        GrainCheckModel.get().getList(mTab, page, mUid, new DataCallback<List<GrainCheckBean>>() {
             @Override
             public void onSuccess(List<GrainCheckBean> data) {
-                if (!isActive())return;
+                if (!isActive()) return;
 
                 if (page == 1) {
                     mAdapter.setList(data);
@@ -127,7 +122,9 @@ public class GrainCheckListFragment extends BaseListFragment<FragmentBaseListBin
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEvent(GrainCheckEvent event) {
-        if (event.tab != null && event.tab == mTab)
+//        if (event.tab != null && event.tab == mTab)
+        if (!isFirstLoad)// 页面已加载
+            // 刷新页面
             onRefresh();
     }
 

app/src/main/java/com/unis/sxzcl/ui/house/SelectHouseDialog.java

@@ -0,0 +1,110 @@
+package com.unis.sxzcl.ui.house;
+
+import android.content.Context;
+
+import com.unis.model.DataCallback;
+import com.unis.model.HouseModel;
+import com.unis.model.bean.HouseListBean;
+import com.unis.sxzcl.widget.BottomMultipleListDialog;
+import com.unis.sxzcl.widget.MultipleBean;
+import com.xyxsbj.mylibrary.tool.ToastTool;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 包名: com.unis.sxzcl.ui.house
+ * 类名: SelectHouseDialog
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2020/12/29 16:35
+ * 更新人:
+ * 更新时间: 2020/12/29 16:35
+ * 更新说明:
+ * 版本号: 1.0
+ */
+public class SelectHouseDialog {
+
+    private Context mContext;
+
+    private BottomMultipleListDialog mListDialog;
+
+    private List<MultipleBean> mMultipleList = new ArrayList<>();
+    private List<HouseListBean> mHouseList = new ArrayList<>();
+
+    private Callback mCallback;
+
+    public SelectHouseDialog(Context context) {
+        mContext = context;
+        init();
+    }
+
+    private void init() {
+        if (mListDialog == null) {
+            mListDialog = new BottomMultipleListDialog(mContext)
+                    .hideTwoList()
+                    .hideThreeList()
+                    .hideRightEnter()
+                    .setTitle("选择仓房")
+            ;
+        }
+    }
+
+    /**
+     * 显示仓房选择弹出框
+     * 选择后自动保存到SP中,并回调给使用者
+     *
+     * @param depotId
+     * @param defSelIndex
+     */
+    public void show(Integer depotId, int defSelIndex) {
+        mMultipleList.clear();
+        mHouseList.clear();
+        mListDialog.setListOne(mMultipleList)
+                .setSelectOne(defSelIndex)
+                .setOneCallback((v, b1) -> {
+                    //仓房点击事件
+                    HouseListBean houseBean = null;
+
+                    int oneSelect = mListDialog.getOneSelect();
+                    if (oneSelect != -1) {
+                        houseBean = mHouseList.get(oneSelect);
+                        HouseModel.get().setSelectHouse(mHouseList.get(oneSelect));
+                    }
+
+                    if (mCallback != null)
+                        mCallback.onSelectHouseListener(houseBean);
+
+                    return true;
+                })
+                .show();
+
+        //获取数据
+        if (depotId == null) {
+            ToastTool.showLong("请先选择粮库");
+            return;
+        }
+        HouseModel.get().getHouseList(depotId.toString(), new DataCallback<List<HouseListBean>>() {
+            @Override
+            public void onSuccess(List<HouseListBean> data) {
+                try {
+                    mHouseList.addAll(data);
+                    for (HouseListBean bean : data) {
+                        mMultipleList.add(new MultipleBean(bean.houseName));
+                    }
+                    mListDialog.setListOne(mMultipleList);
+                } catch (Exception e) {
+                }
+            }
+        });
+    }
+
+    public void setCallback(Callback callback) {
+        mCallback = callback;
+    }
+
+    public interface Callback {
+        void onSelectHouseListener(HouseListBean bean);
+    }
+
+}

app/src/main/java/com/unis/sxzcl/ui/todo/TodoApplyListAdapter.java

@@ -7,7 +7,6 @@ import androidx.core.content.ContextCompat;
 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.BasicModel;
 import com.unis.model.bean.aeration.AerationBean;
 import com.unis.model.bean.todo.TodoListType;
 import com.unis.sxzcl.R;
@@ -51,16 +50,16 @@ public class TodoApplyListAdapter extends BaseQuickAdapter<AerationBean, BaseVie
         // 仓号: 1号仓\n申请人: 王全德\n申请部门: 仓储部\n公司: xxx公司
         StringBuilder sb = new StringBuilder();
         sb.append("仓号: ")
-                .append(BasicModel.get().getHouseName(item.getHouseId()))
+                .append(item.getHouseName())
                 .append("\n")
                 .append("申请人: ")
-                .append(BasicModel.get().getPersonName(item.getApplyPeople()))
+                .append(item.getApplyName())
                 .append("\n")
                 .append("申请部门: ")
-                .append("")
+                .append(item.getDepartmentName())
                 .append("\n")
                 .append("公司: ")
-                .append(BasicModel.get().getDepotName(item.getDepotId()))
+                .append(item.getCompanyName())
                 .append("\n")
         ;
         holder.setText(R.id.tv_content, sb.toString());

app/src/main/java/com/unis/sxzcl/ui/todo/TodoDetailFragment.java

@@ -5,7 +5,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.unis.model.BasicModel;
 import com.unis.model.DataCallback;
 import com.unis.model.ProcessModel;
 import com.unis.model.bean.aeration.AerationBean;
@@ -168,16 +167,16 @@ public class TodoDetailFragment extends BaseListFragment<FragmentTodoDetailBindi
         // 仓号: 1号仓\n申请人: 王全德\n申请部门: 仓储部\n公司: xxx公司
         StringBuilder sb = new StringBuilder();
         sb.append("仓号: ")
-                .append(BasicModel.get().getHouseName(mBean.getHouseId()))
+                .append(mBean.getHouseName())
                 .append("\n")
                 .append("申请人: ")
-                .append(BasicModel.get().getPersonName(mBean.getApplyPeople()))
+                .append(mBean.getApplyName())
                 .append("\n")
                 .append("申请部门: ")
-                .append("")
+                .append(mBean.getDepartmentName())
                 .append("\n")
                 .append("公司: ")
-                .append(BasicModel.get().getDepotName(mBean.getDepotId()))
+                .append(mBean.getCompanyName())
                 .append("\n")
         ;
         mBinding.tvContent.setText(sb.toString());

app/src/main/java/com/unis/sxzcl/ui/todo/TodoFinishListAdapter.java

@@ -8,7 +8,6 @@ import androidx.core.content.ContextCompat;
 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.BasicModel;
 import com.unis.model.bean.aeration.AerationBean;
 import com.unis.model.bean.todo.TodoListType;
 import com.unis.sxzcl.R;
@@ -54,16 +53,16 @@ public class TodoFinishListAdapter extends BaseQuickAdapter<AerationBean, BaseVi
         // 仓号: 1号仓\n申请人: 王全德\n申请部门: 仓储部\n公司: xxx公司
         StringBuilder sb = new StringBuilder();
         sb.append("仓号: ")
-                .append(BasicModel.get().getHouseName(item.getHouseId()))
+                .append(item.getHouseName())
                 .append("\n")
                 .append("申请人: ")
-                .append(BasicModel.get().getPersonName(item.getApplyPeople()))
+                .append(item.getApplyName())
                 .append("\n")
                 .append("申请部门: ")
-                .append("")
+                .append(item.getDepartmentName())
                 .append("\n")
                 .append("公司: ")
-                .append(BasicModel.get().getDepotName(item.getDepotId()))
+                .append(item.getCompanyName())
                 .append("\n")
         ;
         holder.setText(R.id.tv_content, sb.toString());

app/src/main/java/com/unis/sxzcl/ui/todo/TodoListAdapter.java

@@ -6,7 +6,6 @@ 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.BasicModel;
 import com.unis.model.bean.aeration.AerationBean;
 import com.unis.model.bean.todo.TodoListType;
 import com.unis.sxzcl.R;
@@ -47,16 +46,16 @@ public class TodoListAdapter extends BaseQuickAdapter<AerationBean, BaseViewHold
         // 仓号: 1号仓\n申请人: 王全德\n申请部门: 仓储部\n公司: xxx公司
         StringBuilder sb = new StringBuilder();
         sb.append("仓号: ")
-                .append(BasicModel.get().getHouseName(item.getHouseId()))
+                .append(item.getHouseName())
                 .append("\n")
                 .append("申请人: ")
-                .append(BasicModel.get().getPersonName(item.getApplyPeople()))
+                .append(item.getApplyName())
                 .append("\n")
                 .append("申请部门: ")
-                .append("")
+                .append(item.getDepartmentName())
                 .append("\n")
                 .append("公司: ")
-                .append(BasicModel.get().getDepotName(item.getDepotId()))
+                .append(item.getCompanyName())
                 .append("\n")
         ;
         holder.setText(R.id.tv_content, sb.toString());

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

@@ -6,21 +6,14 @@ import com.bumptech.glide.Glide;
 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.DataCallback;
 import com.unis.model.DepotModel;
-import com.unis.model.HouseModel;
-import com.unis.model.bean.HouseListBean;
 import com.unis.model.bean.MultiDepotBean;
 import com.unis.sxzcl.R;
-import com.unis.sxzcl.widget.BottomMultipleListDialog;
-import com.unis.sxzcl.widget.MultipleBean;
+import com.unis.sxzcl.ui.house.SelectHouseDialog;
 import com.xyxsbj.mylibrary.tool.ToastTool;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * 包名: com.unis.sxzcl.ui.work_module
  * 类名: WorkModuleAdapter
@@ -35,12 +28,10 @@ import java.util.List;
 public class WorkModuleAdapter extends BaseQuickAdapter<WorkModule, BaseViewHolder> implements LoadMoreModule {
 
     private ClickCallback mCallback;
-    private BottomMultipleListDialog mListDialog;
-    private List<MultipleBean> mMultipleList = new ArrayList<>();
-    private List<HouseListBean> mHouseList = new ArrayList<>();
 
     private int currentFragmentId;
     private WorkModule currentWork;
+    private SelectHouseDialog mHouseDialog;
 
 
     public WorkModuleAdapter() {
@@ -174,49 +165,24 @@ public class WorkModuleAdapter extends BaseQuickAdapter<WorkModule, BaseViewHold
      * 选择仓房
      */
     private void showHouseSelect(int fragmentId) {
-        if (mListDialog == null) {
-            mListDialog = new BottomMultipleListDialog(getContext())
-                    .hideTwoList()
-                    .hideThreeList()
-                    .hideRightEnter()
-                    .setTitle("选择仓房")
-            ;
-        }
-        mMultipleList.clear();
-        mHouseList.clear();
-        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();
-
-        //获取数据
         MultiDepotBean depot = DepotModel.get().getSelectDepot();
         if (depot == null) {
             ToastTool.showLong("请先选择库");
             return;
         }
-        HouseModel.get().getHouseList(depot.depotCode.toString(), new DataCallback<List<HouseListBean>>() {
-            @Override
-            public void onSuccess(List<HouseListBean> data) {
-                try {
-                    mHouseList.addAll(data);
-                    for (HouseListBean bean : data) {
-                        mMultipleList.add(new MultipleBean(bean.houseName));
-                    }
-                    mListDialog.setListOne(mMultipleList);
-                } catch (Exception e) {
-                }
-            }
+
+        if (mHouseDialog == null)
+            mHouseDialog = new SelectHouseDialog(getContext());
+        // 监听仓房选择结果
+        mHouseDialog.setCallback(bean -> {
+            if (bean == null)
+                return;
+            currentFragmentId = fragmentId;
+            // 选择仓房 进行下一步
+            next();
         });
+        // 弹出仓房选择对话框
+        mHouseDialog.show(depot.depotCode, -1);
     }
 
     private void next() {

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

@@ -130,6 +130,21 @@ public class BaseTitleBar extends RelativeLayout {
     }
 
     /**
+     * 设置标题左侧图标
+     */
+    public BaseTitleBar setTitleLeftDrawable(Drawable drawable) {
+        mBinding.barTitle.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
+        return this;
+    }
+    /**
+     * 设置标题右侧图标
+     */
+    public BaseTitleBar setTitleRightDrawable(Drawable drawable) {
+        mBinding.barTitle.setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null);
+        return this;
+    }
+
+    /**
      * 左侧控件是否显示
      */
     public BaseTitleBar setLeftVisible(boolean visible) {
@@ -170,6 +185,14 @@ public class BaseTitleBar extends RelativeLayout {
     }
 
     /**
+     * 设置标题控件点击监听
+     */
+    public BaseTitleBar setTitleClickListener(OnClickListener l) {
+        mBinding.barTitle.setOnClickListener(l);
+        return this;
+    }
+
+    /**
      * 设置左侧控件点击监听
      */
     public BaseTitleBar setLeftClickListener(OnClickListener l) {

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

@@ -43,7 +43,7 @@ public class GrainCheckModel {
     /**
      * 获取粮情检查记录
      */
-    public void getList(String checkPerson, int page, Integer uid, Integer depotId, Integer houseId, final DataCallback<List<GrainCheckBean>> callBack) {
+    public void getList(String checkPerson, int page, Integer uid, final DataCallback<List<GrainCheckBean>> callBack) {
         Gson gson = new Gson();
         Map<String, Object> map = new HashMap<>();
         map.put("pageIndex", page);
@@ -51,8 +51,8 @@ public class GrainCheckModel {
         Map<String, Object> condition = new HashMap();
         condition.put("check_person", checkPerson);
         condition.put("uid", uid);
-        condition.put("depotId", depotId);
-        condition.put("houseId", houseId);
+        condition.put("depotId", DepotModel.get().getSelectDepot().depotCode);
+        condition.put("houseId", HouseModel.get().getSelectHouse().houseCode);
         map.put("condition", gson.toJson(condition));
         OkGo.<String>post(UrlPath.grain_check_list)
                 .upJson(gson.toJson(map))

version_info.json

@@ -1,6 +1,14 @@
 {
   "info": [
     {
+      "versionName": "1.9",
+      "versionCode": 9,
+      "content": "1.修改基类逻辑\n2.增加机械通风页标题切换仓房\n3.增加粮情检查页标题切换仓房\n4.待办和机械通风字段修改\n5.机械通风非本人查看时只显示已填流程",
+      "fileName": "sxzcl_release_1.9_9.apk",
+      "must": true,
+      "time": "2020-12-29"
+    },
+    {
       "versionName": "1.8",
       "versionCode": 8,
       "content": "1.修改等待框\n2.输入密码点击完成可直接登录\n3.退出登录时增加提醒\n4.修改饼状图文字大小及颜色\n5.首页后退时增加退出确认\n6.审批流程增加状态图标",