1.对接库信息统计图接口

2.修改人员信息UI
3.修改公告页面UI
4.机械通风增加无审批人提示
5.修改选企业逻辑
6.修改头像刷新页面

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

@@ -26,6 +26,7 @@ import com.unis.model.bean.process.ProcessStepBean;
 import com.unis.model.event.AerationEvent;
 import com.unis.sxzcl.base.BaseListFragment;
 import com.unis.sxzcl.databinding.FragmentAerationDetailBinding;
+import com.unis.sxzcl.widget.dialog.SystemDialog;
 import com.xyxsbj.mylibrary.tool.DPTool;
 import com.xyxsbj.mylibrary.tool.ToastTool;
 
@@ -311,6 +312,12 @@ public class AerationDetailFragment extends BaseListFragment<FragmentAerationDet
     }
 
     private void onSave() {
+        // 没有审批人弹出提示
+        if (!isHaveApprove()) {
+            showApproveDialog();
+            return;
+        }
+
         String houseId = HouseModel.get().getSelectHouse().houseCode.toString();
         String depotId = DepotModel.get().getSelectDepot().depotCode.toString();
         UserBean user = UserModel.get().getUser();
@@ -379,6 +386,27 @@ public class AerationDetailFragment extends BaseListFragment<FragmentAerationDet
 
 
     /**
+     * 审批人是否完整
+     */
+    public boolean isHaveApprove() {
+        List<DetailApproveBean> beans = approveMap.get(mStepAdapter.getData().get(0).id);
+        for (DetailApproveBean item : beans) {
+            // 每个审批人id不得为空
+            if (item.getContent() == null) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public void showApproveDialog() {
+        new SystemDialog(getContext())
+                .setHideTitle()
+                .setMsg("暂无审批人,请先去电脑上设置审批人管理")
+                .setRightButton("确认", null).show();
+    }
+
+    /**
      * 最高流程的所有选项
      * 是否已全部选中
      *

app/src/main/java/com/unis/sxzcl/ui/company/CompanyListFragment.java

@@ -130,6 +130,9 @@ public class CompanyListFragment extends BaseListFragment<FragmentBaseListTitleB
         BaseMultiBean item = (BaseMultiBean) data;
         String extra = item.extra;
         MultiDepotBean bean = getGson().fromJson(extra, MultiDepotBean.class);
+        if (bean.depotCode.equals(1)) {
+            return;
+        }
         DepotModel.get().saveSelectDepot(bean);
         EventBus.getDefault().post(new SelectDepotEvent());
         onBack();

app/src/main/java/com/unis/sxzcl/ui/company/CompanyStatsFragment.java

@@ -1,10 +1,12 @@
 package com.unis.sxzcl.ui.company;
 
+import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
 import com.github.mikephil.charting.data.BarEntry;
 import com.github.mikephil.charting.data.PieEntry;
+import com.unis.model.DataCallback;
 import com.unis.model.DepotModel;
 import com.unis.model.bean.MultiDepotBean;
 import com.unis.sxzcl.base.BaseFragment;
@@ -15,6 +17,7 @@ import com.unis.sxzcl.widget.MyPieChart;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 包名: com.unis.sxzcl.ui.company
@@ -32,6 +35,7 @@ public class CompanyStatsFragment extends BaseFragment<FragmentCompanyStatsBindi
     private MyPieChart mPieChartHouseStatus;
     private MyBarChart mBarChartFoodType;
     private MyPieChart mPieChartStorageStatus;
+    private Integer mDepotId;
 
     @Override
     protected FragmentCompanyStatsBinding getViewBinding(LayoutInflater inflater, ViewGroup container) {
@@ -41,6 +45,7 @@ public class CompanyStatsFragment extends BaseFragment<FragmentCompanyStatsBindi
     @Override
     protected void init() {
         MultiDepotBean selectDepot = DepotModel.get().getSelectDepot();
+        mDepotId = selectDepot.depotCode;
         mBinding.bar.setTitle(selectDepot.depotName);
         mBinding.bar.setLeftClickListener(v -> onBack());
 
@@ -49,46 +54,146 @@ public class CompanyStatsFragment extends BaseFragment<FragmentCompanyStatsBindi
 
     @Override
     protected void onFirstShow() {
+
+        if (mPieChartHouseStatus == null) {
+            mPieChartHouseStatus = new MyPieChart(mBinding.pieHouseStatus);
+        }
+
+        if (mBarChartFoodType == null) {
+            mBarChartFoodType = new MyBarChart(mBinding.barFoodType);
+        }
+
+        if (mPieChartStorageStatus == null) {
+            mPieChartStorageStatus = new MyPieChart(mBinding.pieStorageStatus);
+        }
+
+        showProgress("正在加载...", false);
         getHouseStatus();
         getFoodType();
         getStorageStatus();
     }
 
 
+    /**
+     * 仓房状态饼图
+     */
     private void getHouseStatus() {
-        if (mPieChartHouseStatus == null)
-            mPieChartHouseStatus = new MyPieChart(mBinding.pieHouseStatus);
-        // 仓房状态
-        List<PieEntry> pieEntries = new ArrayList<>();
-        pieEntries.add(new PieEntry(200f, "入库"));
-        pieEntries.add(new PieEntry(290f, "出库"));
-        pieEntries.add(new PieEntry(240f, "通风"));
-        pieEntries.add(new PieEntry(160f, "熏蒸"));
-        mPieChartHouseStatus.showChart(pieEntries, "仓房状态");
+
+        // 请求后台接口
+        DepotModel.get().getWarehouseStatus(1, new DataCallback<List<Map<String, Object>>>() {
+            @Override
+            public void onSuccess(List<Map<String, Object>> data) {
+                if (!isActive()) return;
+                hideProgress();
+
+                if (data == null || data.size() == 0) return;
+
+                // 将数据源 转为 饼图数据
+                List<PieEntry> pieEntries = new ArrayList<>();
+                for (Map<String, Object> item : data) {
+                    String count = (String) item.get("count");
+                    String status = (String) item.get("warehouseStatus");
+                    if (count == null) count = "0";
+                    if (status == null) status = "";
+                    pieEntries.add(new PieEntry(Float.parseFloat(count), status));
+                }
+                List<Integer> list = Arrays.asList(
+                        Color.parseColor("#FFA100"),
+                        Color.parseColor("#1FA2EB"),
+                        Color.parseColor("#F3DE38"),
+                        Color.parseColor("#89BF6B"));
+                // 显示饼图
+                mPieChartHouseStatus.showChart(pieEntries, "仓房状态", list);
+            }
+
+            @Override
+            public void onError(String error) {
+                super.onError(error);
+                if (!isActive()) return;
+                hideProgress();
+            }
+        });
     }
 
+    /**
+     * 粮食品种柱状图
+     */
     private void getFoodType() {
-        if (mBarChartFoodType == null)
-            mBarChartFoodType = new MyBarChart(mBinding.barFoodType);
 
-        // 粮食品种
-        ArrayList<BarEntry> barEntries = new ArrayList<>();
-        barEntries.add(new BarEntry(0, 140));
-        barEntries.add(new BarEntry(1, 120));
-        barEntries.add(new BarEntry(2, 80));
-        barEntries.add(new BarEntry(3, 50));
-        List<String> workTypeLabels = Arrays.asList("玉米", "小麦", "大豆", "稻谷");
-        mBarChartFoodType.showChart(workTypeLabels, barEntries);
+        DepotModel.get().getFoodTypeCount(1, new DataCallback<List<Map<String, Object>>>() {
+            @Override
+            public void onSuccess(List<Map<String, Object>> data) {
+                if (!isActive()) return;
+                hideProgress();
+
+                if (data == null || data.size() == 0) return;
+
+                // 将数据源 转为 饼图数据
+                List<String> labelList = new ArrayList<>();
+                ArrayList<BarEntry> valueList = new ArrayList<>();
+                for (int i = 0; i < data.size(); i++) {
+                    Map<String, Object> item = data.get(i);
+
+                    String label = (String) item.get("grainVarieties");
+                    if (label == null) label = "";
+                    labelList.add(label);
+
+                    String count = (String) item.get("count");
+                    if (count == null) count = "0";
+                    valueList.add(new BarEntry(i, Float.parseFloat(count)));
+
+                }
+                mBarChartFoodType.showChart(labelList, valueList);
+            }
+
+            @Override
+            public void onError(String error) {
+                super.onError(error);
+                if (!isActive()) return;
+                hideProgress();
+
+            }
+        });
     }
 
+    /**
+     * 存储状态饼图
+     */
     private void getStorageStatus() {
-        if (mPieChartStorageStatus == null)
-            mPieChartStorageStatus = new MyPieChart(mBinding.pieStorageStatus);
-        // 储存状态
-        List<PieEntry> pieEntries = new ArrayList<>();
-        pieEntries.add(new PieEntry(200f, "空仓"));
-        pieEntries.add(new PieEntry(290f, "满仓"));
-        pieEntries.add(new PieEntry(240f, "半仓"));
-        mPieChartStorageStatus.showChart(pieEntries, "储存状态");
+
+        // 请求后台接口
+        DepotModel.get().getStorageStatus(1, new DataCallback<List<Map<String, Object>>>() {
+            @Override
+            public void onSuccess(List<Map<String, Object>> data) {
+                if (!isActive()) return;
+                hideProgress();
+
+                if (data == null || data.size() == 0) return;
+
+                // 将数据源 转为 饼图数据
+                List<PieEntry> pieEntries = new ArrayList<>();
+                for (Map<String, Object> item : data) {
+                    String count = (String) item.get("count");
+                    String status = (String) item.get("storageStatus");
+                    if (count == null) count = "0";
+                    if (status == null) status = "";
+                    pieEntries.add(new PieEntry(Float.parseFloat(count), status));
+                }
+                List<Integer> list = Arrays.asList(
+                        Color.parseColor("#057B43"),
+                        Color.parseColor("#8ABF6B"),
+                        Color.parseColor("#F3DE38"));
+                // 显示饼图
+                mPieChartStorageStatus.showChart(pieEntries, "储存状态", list);
+            }
+
+            @Override
+            public void onError(String error) {
+                super.onError(error);
+                if (!isActive()) return;
+                hideProgress();
+
+            }
+        });
     }
 }

app/src/main/java/com/unis/sxzcl/ui/home/HomeFragment.java

@@ -1,6 +1,6 @@
 package com.unis.sxzcl.ui.home;
 
-import android.os.Bundle;
+import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,6 +10,7 @@ import com.github.mikephil.charting.data.BarEntry;
 import com.github.mikephil.charting.data.PieEntry;
 import com.unis.model.AnnounceModel;
 import com.unis.model.DataCallback;
+import com.unis.model.DepotModel;
 import com.unis.model.NoticeModel;
 import com.unis.model.ProcessModel;
 import com.unis.model.UrlPath;
@@ -34,6 +35,7 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 包名: com.unis.sxzcl.ui.home
@@ -76,26 +78,22 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
             // 个人信息
             navigation(R.id.userFragment);
         });
-//        mBinding.layoutCompany.setOnClickListener(v -> {
+//        mBinding.tvDepotCount.setOnClickListener(v -> {
 //            // 库列表
 //            navigation(R.id.companyListFragment);
 //        });
-        mBinding.tvDepotCount.setOnClickListener(v -> {
-            // 库列表
-            navigation(R.id.companyListFragment);
-        });
-        mBinding.tvHouseCount.setOnClickListener(v -> {
-            // 仓列表
-            Bundle bundle = new Bundle();
-            bundle.putBoolean("showTitle", true);
-            navigation(R.id.houseListFragment, bundle);
-        });
-        mBinding.tvPersonCount.setOnClickListener(v -> {
-            // 人员列表
-            Bundle bundle = new Bundle();
-            bundle.putBoolean("showTitle", true);
-            navigation(R.id.personListFragment, bundle);
-        });
+//        mBinding.tvHouseCount.setOnClickListener(v -> {
+//            // 仓列表
+//            Bundle bundle = new Bundle();
+//            bundle.putBoolean("showTitle", true);
+//            navigation(R.id.houseListFragment, bundle);
+//        });
+//        mBinding.tvPersonCount.setOnClickListener(v -> {
+//            // 人员列表
+//            Bundle bundle = new Bundle();
+//            bundle.putBoolean("showTitle", true);
+//            navigation(R.id.personListFragment, bundle);
+//        });
 
         // 初始化轮播图
         initBanner();
@@ -110,6 +108,18 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
 
     @Override
     protected void onFirstShow() {
+        if (mPieChartHouseStatus == null) {
+            mPieChartHouseStatus = new MyPieChart(mBinding.pieHouseStatus);
+        }
+
+        if (mBarChartFoodType == null) {
+            mBarChartFoodType = new MyBarChart(mBinding.barFoodType);
+        }
+
+        if (mPieChartStorageStatus == null) {
+            mPieChartStorageStatus = new MyPieChart(mBinding.pieStorageStatus);
+        }
+
         getData();
     }
 
@@ -120,18 +130,10 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
         getFoodType();
         getStorageStatus();
 
-        UserBean user = UserModel.get().getUser();
-        if (user == null) return;
-        mBinding.tvCompany.setText(user.getDepotName());
-        Glide.with(getContext())
-                .load(UrlPath.image_host + user.getPheadPortrait())
-                .placeholder(R.drawable.ic_img_loading)
-                .error(R.drawable.ic_user_empty)
-                .into(mBinding.ivUser);
-
         getTodoCount();
         getNoticeCount();
         getAnnounceList();
+        getUserInfo();
     }
 
 
@@ -147,41 +149,137 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
         mBannerUtils.setImagesResId(list);
     }
 
+    /**
+     * 仓房状态饼图
+     */
     private void getHouseStatus() {
-        if (mPieChartHouseStatus == null)
-            mPieChartHouseStatus = new MyPieChart(mBinding.pieHouseStatus);
-        // 仓房状态
-        List<PieEntry> pieEntries = new ArrayList<>();
-        pieEntries.add(new PieEntry(200f, "入库"));
-        pieEntries.add(new PieEntry(290f, "出库"));
-        pieEntries.add(new PieEntry(240f, "通风"));
-        pieEntries.add(new PieEntry(160f, "熏蒸"));
-        mPieChartHouseStatus.showChart(pieEntries, "仓房状态");
+
+        UserBean user = UserModel.get().getUser();
+        if (user == null) return;
+        String depotId = user.getDepotId();
+        if (depotId == null) return;
+        // 请求后台接口
+        DepotModel.get().getWarehouseStatus(Integer.parseInt(depotId), new DataCallback<List<Map<String, Object>>>() {
+            @Override
+            public void onSuccess(List<Map<String, Object>> data) {
+                if (!isActive()) return;
+                mBinding.refreshLayout.setRefreshing(false);
+
+                if (data == null || data.size() == 0) return;
+
+                // 将数据源 转为 饼图数据
+                List<PieEntry> pieEntries = new ArrayList<>();
+                for (Map<String, Object> item : data) {
+                    String count = (String) item.get("count");
+                    String status = (String) item.get("warehouseStatus");
+                    if (count == null) count = "0";
+                    if (status == null) status = "";
+                    pieEntries.add(new PieEntry(Float.parseFloat(count), status));
+                }
+                List<Integer> list = Arrays.asList(
+                        Color.parseColor("#FFA100"),
+                        Color.parseColor("#1FA2EB"),
+                        Color.parseColor("#F3DE38"),
+                        Color.parseColor("#89BF6B"));
+                // 显示饼图
+                mPieChartHouseStatus.showChart(pieEntries, "仓房状态", list);
+            }
+
+            @Override
+            public void onError(String error) {
+                super.onError(error);
+                if (!isActive()) return;
+                mBinding.refreshLayout.setRefreshing(false);
+            }
+        });
     }
 
+    /**
+     * 粮食品种柱状图
+     */
     private void getFoodType() {
-        if (mBarChartFoodType == null)
-            mBarChartFoodType = new MyBarChart(mBinding.barFoodType);
+        UserBean user = UserModel.get().getUser();
+        if (user == null) return;
+        String depotId = user.getDepotId();
+        if (depotId == null) return;
+        DepotModel.get().getFoodTypeCount(Integer.parseInt(depotId), new DataCallback<List<Map<String, Object>>>() {
+            @Override
+            public void onSuccess(List<Map<String, Object>> data) {
+                if (!isActive()) return;
+                mBinding.refreshLayout.setRefreshing(false);
+
+                if (data == null || data.size() == 0) return;
+
+                // 将数据源 转为 饼图数据
+                List<String> labelList = new ArrayList<>();
+                ArrayList<BarEntry> valueList = new ArrayList<>();
+                for (int i = 0; i < data.size(); i++) {
+                    Map<String, Object> item = data.get(i);
+
+                    String label = (String) item.get("grainVarieties");
+                    if (label == null) label = "";
+                    labelList.add(label);
+
+                    String count = (String) item.get("count");
+                    if (count == null) count = "0";
+                    valueList.add(new BarEntry(i, Float.parseFloat(count)));
+
+                }
+                mBarChartFoodType.showChart(labelList, valueList);
+            }
+
+            @Override
+            public void onError(String error) {
+                super.onError(error);
+                if (!isActive()) return;
+                mBinding.refreshLayout.setRefreshing(false);
+            }
+        });
 
-        // 粮食品种
-        ArrayList<BarEntry> barEntries = new ArrayList<>();
-        barEntries.add(new BarEntry(0, 140));
-        barEntries.add(new BarEntry(1, 120));
-        barEntries.add(new BarEntry(2, 80));
-        barEntries.add(new BarEntry(3, 50));
-        List<String> workTypeLabels = Arrays.asList("玉米", "小麦", "大豆", "稻谷");
-        mBarChartFoodType.showChart(workTypeLabels, barEntries);
     }
 
+    /**
+     * 存储状态饼图
+     */
     private void getStorageStatus() {
-        if (mPieChartStorageStatus == null)
-            mPieChartStorageStatus = new MyPieChart(mBinding.pieStorageStatus);
-        // 储存状态
-        List<PieEntry> pieEntries = new ArrayList<>();
-        pieEntries.add(new PieEntry(200f, "空仓"));
-        pieEntries.add(new PieEntry(290f, "满仓"));
-        pieEntries.add(new PieEntry(240f, "半仓"));
-        mPieChartStorageStatus.showChart(pieEntries, "储存状态");
+
+        UserBean user = UserModel.get().getUser();
+        if (user == null) return;
+        String depotId = user.getDepotId();
+        if (depotId == null) return;
+        // 请求后台接口
+        DepotModel.get().getStorageStatus(Integer.parseInt(depotId), new DataCallback<List<Map<String, Object>>>() {
+            @Override
+            public void onSuccess(List<Map<String, Object>> data) {
+                if (!isActive()) return;
+                mBinding.refreshLayout.setRefreshing(false);
+
+                if (data == null || data.size() == 0) return;
+
+                // 将数据源 转为 饼图数据
+                List<PieEntry> pieEntries = new ArrayList<>();
+                for (Map<String, Object> item : data) {
+                    String count = (String) item.get("count");
+                    String status = (String) item.get("storageStatus");
+                    if (count == null) count = "0";
+                    if (status == null) status = "";
+                    pieEntries.add(new PieEntry(Float.parseFloat(count), status));
+                }
+                List<Integer> list = Arrays.asList(
+                        Color.parseColor("#057B43"),
+                        Color.parseColor("#8ABF6B"),
+                        Color.parseColor("#F3DE38"));
+                // 显示饼图
+                mPieChartStorageStatus.showChart(pieEntries, "储存状态", list);
+            }
+
+            @Override
+            public void onError(String error) {
+                super.onError(error);
+                if (!isActive()) return;
+                mBinding.refreshLayout.setRefreshing(false);
+            }
+        });
     }
 
 
@@ -203,8 +301,8 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
             @Override
             public void onSuccess(Integer data) {
                 if (!isActive()) return;
-
                 mBinding.refreshLayout.setRefreshing(false);
+
                 if ((int) data == 0) {
                     mBinding.tvTodoCount.setVisibility(View.GONE);
                     return;
@@ -212,6 +310,13 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
                 mBinding.tvTodoCount.setVisibility(View.VISIBLE);
                 mBinding.tvTodoCount.setText(data + "");
             }
+
+            @Override
+            public void onError(String error) {
+                super.onError(error);
+                if (!isActive()) return;
+                mBinding.refreshLayout.setRefreshing(false);
+            }
         });
     }
 
@@ -223,6 +328,7 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
             @Override
             public void onSuccess(Integer data) {
                 if (!isActive()) return;
+                mBinding.refreshLayout.setRefreshing(false);
 
                 if ((int) data == 0) {
                     mBinding.tvNoticeCount.setVisibility(View.GONE);
@@ -231,6 +337,13 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
                 mBinding.tvNoticeCount.setVisibility(View.VISIBLE);
                 mBinding.tvNoticeCount.setText(data + "");
             }
+
+            @Override
+            public void onError(String error) {
+                super.onError(error);
+                if (!isActive()) return;
+                mBinding.refreshLayout.setRefreshing(false);
+            }
         });
     }
 
@@ -243,6 +356,7 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
             @Override
             public void onSuccess(List<AnnounceBean> data) {
                 if (!isActive()) return;
+                mBinding.refreshLayout.setRefreshing(false);
 
                 if (data.size() == 0) return;
 
@@ -259,6 +373,48 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
                         })
                 ;
             }
+
+            @Override
+            public void onError(String error) {
+                super.onError(error);
+                if (!isActive()) return;
+                mBinding.refreshLayout.setRefreshing(false);
+            }
+        });
+    }
+
+    /**
+     * 收到消息 刷新用户信息
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onUserEvent(UserBean event) {
+        getUserInfo();
+    }
+
+    /**
+     * 获取用户信息
+     */
+    private void getUserInfo() {
+        UserModel.get().refreshUser(new DataCallback<UserBean>() {
+            @Override
+            public void onSuccess(UserBean user) {
+                if (!isActive()) return;
+                mBinding.refreshLayout.setRefreshing(false);
+
+                mBinding.tvCompany.setText(user.getDepotName());
+                Glide.with(getContext())
+                        .load(UrlPath.image_host + user.getPheadPortrait())
+                        .placeholder(R.drawable.ic_img_loading)
+                        .error(R.drawable.ic_user_empty)
+                        .into(mBinding.ivUser);
+            }
+
+            @Override
+            public void onError(String error) {
+                super.onError(error);
+                if (!isActive()) return;
+                mBinding.refreshLayout.setRefreshing(false);
+            }
         });
     }
 

app/src/main/java/com/unis/sxzcl/ui/home/MainFragment.java

@@ -10,12 +10,16 @@ import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 
 import com.unis.model.DataCallback;
+import com.unis.model.DepotModel;
 import com.unis.model.VersionModel;
+import com.unis.model.bean.MultiDepotBean;
 import com.unis.model.bean.VersionBean;
+import com.unis.sxzcl.R;
 import com.unis.sxzcl.base.BaseFragment;
 import com.unis.sxzcl.databinding.FragmentMainBinding;
 import com.unis.sxzcl.ui.work_module.WorkModuleFragment;
 import com.unis.sxzcl.widget.MyFragmentStatePagerAdapter;
+import com.unis.sxzcl.widget.dialog.SystemDialog;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,6 +44,7 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> {
     private boolean[] mTabTopWhite;
 
     private int indexFlag = -1;//tab选中标记
+    private SystemDialog mSelectDepotDialog;
 
 
     @Override
@@ -80,6 +85,14 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> {
             @Override
             public void onPageSelected(int position) {
                 updateTab(position);
+
+                if (position == mFragmentList.size() - 1) {
+                    // 作业功能列表时 未选库弹出提示
+                    MultiDepotBean selectDepot = DepotModel.get().getSelectDepot();
+                    if (selectDepot == null) {
+                        showSelectDepotDialog();
+                    }
+                }
             }
 
             @Override
@@ -89,6 +102,21 @@ public class MainFragment extends BaseFragment<FragmentMainBinding> {
         });
     }
 
+    // 弹出选择粮库对话框
+    public void showSelectDepotDialog() {
+        if (mSelectDepotDialog == null)
+            mSelectDepotDialog = new SystemDialog(getContext())
+                    .setHideTitle()
+                    .setMsg("请先选择粮库")
+                    .setLeftButton("取消", null)
+                    .setRightButton("去选择", dialog -> {
+                        mSelectDepotDialog.dismiss();
+                        // 切换组织架构
+                        navigation(R.id.companyListFragment);
+                    });
+        mSelectDepotDialog.show();
+    }
+
     /**
      * 初始化Fragment
      */

app/src/main/java/com/unis/sxzcl/ui/user/UserFragment.java

@@ -227,6 +227,7 @@ public class UserFragment extends BaseFragment<FragmentUserBinding> {
                 if (!isActive()) return;
                 hideProgress();
                 ToastTool.showLong("头像修改成功!");
+                EventBus.getDefault().post(new UserBean());
             }
 
             @Override

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

@@ -122,6 +122,7 @@ public class WorkModuleFragment extends BaseListFragment<FragmentWorkModuleBindi
 
     @Override
     protected void onFirstShow() {
+
         onRefresh();
     }
 

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

@@ -101,16 +101,25 @@ public class MyPieChart {
     }
 
     public void showChart(List<PieEntry> values, String name) {
+        showChart(values, name, null);
+    }
+
+    public void showChart(List<PieEntry> values, String name, List<Integer> colors) {
         //设置PieChart内部圆文字的内容
         mPieChart.setCenterText(name);
         PieDataSet pieDataSet = new PieDataSet(values, name);
-        //分别为每个分组设置颜色
-        pieDataSet.setColors(
-                Color.parseColor("#47C7E8"),
-                Color.parseColor("#A5E7BA"),
-                Color.parseColor("#F56D91"),
-                Color.parseColor("#FA9C80"),
-                Color.parseColor("#968FEB"));
+
+        if (colors == null) {
+            //分别为每个分组设置颜色
+            pieDataSet.setColors(
+                    Color.parseColor("#47C7E8"),
+                    Color.parseColor("#A5E7BA"),
+                    Color.parseColor("#F56D91"),
+                    Color.parseColor("#FA9C80"),
+                    Color.parseColor("#968FEB"));
+        } else {
+            pieDataSet.setColors(colors);
+        }
 
         //设置饼块选中时偏离饼图中心的距离
         pieDataSet.setSelectionShift(8f);

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

@@ -51,7 +51,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop"
-                android:src="@drawable/no_banner" />
+                android:src="@drawable/ic_user_empty" />
         </androidx.cardview.widget.CardView>
 
 

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

@@ -22,141 +22,134 @@
             android:background="@color/colorWhite"
             android:orientation="vertical">
 
-            <androidx.cardview.widget.CardView
-                android:layout_width="140dp"
-                android:layout_height="140dp"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="8dp"
-                app:cardCornerRadius="70dp"
-                app:cardElevation="4dp">
-
-                <ImageView
-                    android:id="@+id/iv_show"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/no_banner" />
-
-            </androidx.cardview.widget.CardView>
-
-            <TextView
-                android:id="@+id/tv_name"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:text=""
-                android:textColor="@color/colorTextBlack"
-                android:textSize="?attr/textSizeXXX"
-                android:textStyle="bold" />
+                android:background="@color/colorBackground"
+                android:orientation="vertical">
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="140dp"
+                    android:layout_height="140dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="32dp"
+                    app:cardCornerRadius="70dp"
+                    app:cardElevation="8dp">
+
+                    <ImageView
+                        android:id="@+id/iv_show"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop"
+                        android:src="@drawable/ic_user_empty" />
+
+                </androidx.cardview.widget.CardView>
+
+                <TextView
+                    android:id="@+id/tv_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="32dp"
+                    android:text="昵称"
+                    android:textColor="@color/colorText33"
+                    android:textSize="?attr/textSizeXXXX"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
 
             <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginTop="16dp"
-                android:text="性别"
-                android:textColor="@color/colorTextBlack"
-                android:textSize="?attr/textSizeXX" />
+                style="@style/person_detail_title"
+                android:text="性别" />
 
             <TextView
                 android:id="@+id/tv_sex"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:text=""
-                android:textColor="@color/colorTheme"
-                android:textSize="?attr/textSizeXXX" />
+                style="@style/person_detail_content"
+                android:text="性别" />
+
+            <View
+                style="@style/line_16"
+                android:layout_marginTop="16dp" />
 
             <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginTop="16dp"
-                android:text="所属公司"
-                android:textColor="@color/colorTextBlack"
-                android:textSize="?attr/textSizeXX" />
+                style="@style/person_detail_title"
+                android:text="所属公司" />
 
             <TextView
                 android:id="@+id/tv_company"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:text=""
-                android:textColor="@color/colorTheme"
-                android:textSize="?attr/textSizeXXX" />
+                style="@style/person_detail_content"
+                android:text="所属公司" />
+
+            <View
+                style="@style/line_16"
+                android:layout_marginTop="16dp" />
 
             <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginTop="16dp"
-                android:text="所属科室"
-                android:textColor="@color/colorTextBlack"
-                android:textSize="?attr/textSizeXX" />
+                style="@style/person_detail_title"
+                android:text="所属科室" />
 
             <TextView
                 android:id="@+id/tv_deportment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:text=""
-                android:textColor="@color/colorTheme"
-                android:textSize="?attr/textSizeXXX" />
+                style="@style/person_detail_content"
+                android:text="所属科室" />
+
+            <View
+                style="@style/line_16"
+                android:layout_marginTop="16dp" />
 
             <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginTop="16dp"
-                android:text="职位"
-                android:textColor="@color/colorTextBlack"
-                android:textSize="?attr/textSizeXX" />
+                style="@style/person_detail_title"
+                android:text="职位" />
 
             <TextView
                 android:id="@+id/tv_post"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:text=""
-                android:textColor="@color/colorTheme"
-                android:textSize="?attr/textSizeXXX" />
+                style="@style/person_detail_content"
+                android:text="职位" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginTop="16dp"
-                android:text="手机号"
-                android:textColor="@color/colorTextBlack"
-                android:textSize="?attr/textSizeXX" />
+            <View
+                style="@style/line_16"
+                android:layout_marginTop="16dp" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp">
+                android:orientation="horizontal">
 
-                <TextView
-                    android:id="@+id/tv_phone"
+                <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text=""
-                    android:textColor="@color/colorTheme"
-                    android:textSize="?attr/textSizeXXX" />
+                    android:orientation="vertical">
+
+                    <TextView
+                        style="@style/person_detail_title"
+                        android:text="手机号" />
+
+                    <TextView
+                        android:id="@+id/tv_phone"
+                        style="@style/person_detail_content"
+                        android:layout_marginBottom="16dp"
+                        android:text="" />
+                </LinearLayout>
+
 
                 <TextView
                     android:id="@+id/tv_call"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginRight="16dp"
                     android:background="@drawable/accent_radius_stroke_bg"
                     android:paddingLeft="16dp"
                     android:paddingTop="8dp"
                     android:paddingRight="16dp"
                     android:paddingBottom="8dp"
                     android:text="拨打电话"
-                    android:textColor="@color/colorTheme" />
+                    android:textColor="@color/colorTheme"
+                    android:textSize="?attr/textSizeXX"
+                    android:textStyle="bold" />
+
             </LinearLayout>
 
 

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

@@ -24,7 +24,8 @@
         android:layout_marginRight="16dp"
         android:layout_toRightOf="@id/v_flag"
         android:text="标题"
-        android:textColor="@color/colorText33"
+        android:textStyle="bold"
+        android:textColor="@color/colorTheme"
         android:textSize="?attr/textSizeXX" />
 
     <TextView

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

@@ -156,7 +156,6 @@
     <style name="home_info_text">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:foreground">?android:selectableItemBackground</item>
         <item name="android:gravity">center</item>
         <item name="android:paddingLeft">24dp</item>
         <item name="android:paddingRight">24dp</item>
@@ -166,4 +165,23 @@
         <item name="android:textSize">?attr/textSizeXX</item>
     </style>
 
+    <style name="person_detail_title">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">16dp</item>
+        <item name="android:layout_marginTop">16dp</item>
+        <item name="android:textColor">@color/colorText55</item>
+        <item name="android:textSize">?attr/textSizeXX</item>
+    </style>
+
+    <style name="person_detail_content">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">16dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:textColor">@color/colorText33</item>
+        <item name="android:textSize">?attr/textSizeXXX</item>
+    </style>
+
+
 </resources>

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

@@ -133,9 +133,9 @@ public class BasicModel {
      * 获取人员字典
      */
     public void getPersonDictionary() {
-        String depotId = UserModel.get().getUser().getDepotId();
+//        String depotId = UserModel.get().getUser().getDepotId();
         GetRequest<String> request = OkGo.get(UrlPath.person_dictionary);
-        request.params("depotId", depotId);
+//        request.params("depotId", depotId);
         request.execute(new MyStringCallback() {
             @Override
             protected void onSuccessResult(Response<String> response) throws JSONException {

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

@@ -4,13 +4,16 @@ import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.model.Response;
+import com.lzy.okgo.request.PostRequest;
 import com.unis.model.bean.MultiDepotBean;
 import com.xyxsbj.mylibrary.tool.SPTool;
 
 import org.json.JSONException;
 
 import java.lang.reflect.Type;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 包名: com.unis.model
@@ -68,6 +71,7 @@ public class DepotModel {
     public void saveSelectDepot(MultiDepotBean bean) {
         SPTool.saveString(Constant.KEY_SELECT_DEPOT, new Gson().toJson(bean));
     }
+
     public void removeSelectDepot() {
         SPTool.remove(Constant.KEY_SELECT_DEPOT);
     }
@@ -83,4 +87,86 @@ public class DepotModel {
         return bean;
     }
 
+    /**
+     * 获取存储状态统计
+     */
+    public void getStorageStatus(Integer depotId, final DataCallback<List<Map<String, Object>>> callback) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("depotId", depotId);
+        map.put("storageStatus", "s");
+        PostRequest<String> request = OkGo.post(UrlPath.home_percent);
+        request.upJson(new Gson().toJson(map));
+        request.execute(new MyStringCallback() {
+            @Override
+            protected void onSuccessResult(Response<String> response) throws JSONException {
+                String json = getDataJson(response);
+                List<Map<String, Object>> list =
+                        new Gson().fromJson(json, new TypeToken<List<Map<String, Object>>>() {
+                        }.getType());
+                callback.onSuccess(list);
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                callback.onError(getErrorMsg(response));
+            }
+        });
+    }
+
+    /**
+     * 获取仓房状态统计
+     */
+    public void getWarehouseStatus(Integer depotId, final DataCallback<List<Map<String, Object>>> callback) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("depotId", depotId);
+        map.put("warehouseStatus", "w");
+        PostRequest<String> request = OkGo.post(UrlPath.home_percent);
+        request.upJson(new Gson().toJson(map));
+        request.execute(new MyStringCallback() {
+            @Override
+            protected void onSuccessResult(Response<String> response) throws JSONException {
+                String json = getDataJson(response);
+                List<Map<String, Object>> list =
+                        new Gson().fromJson(json, new TypeToken<List<Map<String, Object>>>() {
+                        }.getType());
+                callback.onSuccess(list);
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                callback.onError(getErrorMsg(response));
+            }
+        });
+    }
+
+    /**
+     * 获取粮食品种统计
+     */
+    public void getFoodTypeCount(Integer depotId, final DataCallback<List<Map<String, Object>>> callback) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("depotId", depotId);
+        map.put("grainVarieties", "g");
+        PostRequest<String> request = OkGo.post(UrlPath.home_percent);
+        request.upJson(new Gson().toJson(map));
+        request.execute(new MyStringCallback() {
+            @Override
+            protected void onSuccessResult(Response<String> response) throws JSONException {
+                String json = getDataJson(response);
+                List<Map<String, Object>> list =
+                        new Gson().fromJson(json, new TypeToken<List<Map<String, Object>>>() {
+                        }.getType());
+                callback.onSuccess(list);
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                callback.onError(getErrorMsg(response));
+            }
+        });
+    }
+
+
 }

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

@@ -30,6 +30,9 @@ public abstract class MyStringCallback extends StringCallback {
     @Override
     public void onStart(Request<String, ? extends Request> request) {
         super.onStart(request);
+//        CookieStore store = OkGo.getInstance().getCookieJar().getCookieStore();
+//        List<Cookie> allCookie = store.getAllCookie();
+//        LogTool.d("所有cookie如下：" + allCookie.toString());
     }
 
     protected abstract void onSuccessResult(Response<String> response) throws JSONException;

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

@@ -34,6 +34,8 @@ public class UrlPath {
 
     // 新增用户
     public static final String user_add = host + "/api/csc-szls-system-manage/user/authority_button/add";
+    // 用户信息
+    public static final String user_info = host + "/api/csc-szls-system-manage/user/authority/getById";
 
 
     /****************** 库 ******************/
@@ -67,7 +69,6 @@ public class UrlPath {
     public static final String person_dictionary = host + "/api/csc-szls-system-manage/user/authority/getAll";
 
 
-
     /****************** 部门 ******************/
     // 部门字典
     public static final String department_dictionary = host + "/api/csc-szls-system-manage/sysDepartment/authority/getAllMAP";
@@ -121,4 +122,12 @@ public class UrlPath {
     public static final String announce_list = host + "/api/csc-szls-message/sysAnnouncementUser/authority/getPage";
 
 
+    /****************** 首页 ******************/
+    // 获取统计图
+    public static final String home_percent = host + "/api/csc-szls-system-manage/basicsWarehouse/authority/getPercent";
+
+
+
+
+
 }

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

@@ -16,6 +16,7 @@ import com.unis.model.bean.person.PersonBean;
 import com.unis.model.bean.person.PersonTreeBean;
 import com.xyxsbj.mylibrary.tool.LogTool;
 import com.xyxsbj.mylibrary.tool.SPTool;
+import com.xyxsbj.mylibrary.tool.ToastTool;
 
 import org.json.JSONException;
 
@@ -119,13 +120,14 @@ public class UserModel {
                         // 添加cookie
                         HttpUrl httpUrl = HttpUrl.parse(UrlPath.host);
                         Cookie.Builder builder = new Cookie.Builder();
-                        Cookie cookieToken = builder.name("Token").value(tokenType + "%20" + accessToken).domain(httpUrl.host()).build();
+//                        Cookie cookieToken = builder.name("Token").value(tokenType + "%20" + accessToken).domain(httpUrl.host()).build();
+                        Cookie cookieToken = builder.name("Token").value(token).domain(httpUrl.host()).build();
                         CookieStore cookieStore = OkGo.getInstance().getCookieJar().getCookieStore();
                         cookieStore.saveCookie(httpUrl, cookieToken);
 
                         CookieStore store = OkGo.getInstance().getCookieJar().getCookieStore();
                         List<Cookie> allCookie = store.getAllCookie();
-                        LogTool.i("所有cookie如下：" + allCookie.toString());
+                        LogTool.d("所有cookie如下：" + allCookie.toString());
 
                         if (callBack != null)
                             callBack.onSuccess(bean);
@@ -140,6 +142,36 @@ public class UserModel {
     }
 
     /**
+     * 刷新用户信息
+     */
+    public void refreshUser(final DataCallback<UserBean> callback) {
+        UserBean user = getUser();
+        if (user == null) {
+            ToastTool.showLong("没有用户信息");
+            callback.onError(null);
+            return;
+        }
+
+        GetRequest<String> request = OkGo.get(UrlPath.user_info + "/" + user.getUid());
+        request.execute(new MyStringCallback() {
+            @Override
+            protected void onSuccessResult(Response<String> response) throws JSONException {
+                String json = getDataJson(response);
+                SPTool.saveString(Constant.KEY_USER, json);
+                UserBean bean = new Gson().fromJson(json, UserBean.class);
+
+                callback.onSuccess(bean);
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                callback.onError(getErrorMsg(response));
+            }
+        });
+    }
+
+    /**
      * 获取用户信息
      */
     public UserBean getUser() {