1.作业功能修改图标

2.增加公告功能
3.增加修改头像功能

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

@@ -84,6 +84,7 @@ public abstract class BaseFragment<T extends ViewBinding> extends Fragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
+        hideProgress();
         active = false;
     }
 

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

@@ -1,15 +1,17 @@
 package com.unis.sxzcl.ui.announce;
 
+import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
 import com.tencent.smtt.sdk.WebSettings;
+import com.unis.model.bean.AnnounceBean;
 import com.unis.sxzcl.base.BaseFragment;
 import com.unis.sxzcl.databinding.FragmentAccounceDetailBinding;
 import com.xyxsbj.mylibrary.tool.HtmlUtil;
+import com.xyxsbj.mylibrary.tool.ToastTool;
 
 /**
- *
  * 包名: com.unis.sxzcl.ui.announce
  * 类名: AnnounceDetailFragment
  * 作用描述:
@@ -22,14 +24,17 @@ import com.xyxsbj.mylibrary.tool.HtmlUtil;
  */
 public class AnnounceDetailFragment extends BaseFragment<FragmentAccounceDetailBinding> {
 
+    private AnnounceBean mBean;
+
     @Override
     protected FragmentAccounceDetailBinding getViewBinding(LayoutInflater inflater, ViewGroup container) {
-        return FragmentAccounceDetailBinding.inflate(inflater,container,false);
+        return FragmentAccounceDetailBinding.inflate(inflater, container, false);
     }
 
     @Override
     protected void init() {
-        mBinding.bar.setLeftClickListener(v -> onBack());
+        mBinding.bar.setTitle("公告")
+                .setLeftClickListener(v -> onBack());
 
         //初始化webview
         WebSettings settings = mBinding.webView.getSettings();
@@ -42,7 +47,19 @@ public class AnnounceDetailFragment extends BaseFragment<FragmentAccounceDetailB
 
     @Override
     protected void onFirstShow() {
-        mBinding.webView.loadDataWithBaseURL(null, HtmlUtil.getHtmlData(content), "text/html", "utf-8", null);
+        Bundle bundle = getArguments();
+        String data = bundle.getString("data", null);
+        if (data == null) {
+            ToastTool.showLong("没有参数");
+            onBack();
+            return;
+        }
+        mBean = getGson().fromJson(data, AnnounceBean.class);
+        mBinding.tvTitle.setText(mBean.getTitle());
+        mBinding.tvSource.setText(mBean.getPublishOrgName());
+        mBinding.tvTime.setText(mBean.getPublishTime());
+
+        mBinding.webView.loadDataWithBaseURL(null, HtmlUtil.getHtmlData(mBean.getContent()), "text/html", "utf-8", null);
     }
 
     private String content = "<div id=\"u144\" class=\"ax_default _文本段落\" data-label=\"左手交易手续费，右手项目上币费，在疯狂增\">\n" +

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

@@ -1,6 +1,8 @@
 package com.unis.sxzcl.ui.announce;
 
+import android.text.Html;
 import android.view.View;
+import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.module.LoadMoreModule;
@@ -11,7 +13,6 @@ import com.unis.sxzcl.R;
 import org.jetbrains.annotations.NotNull;
 
 /**
- *
  * 包名: com.unis.sxzcl.ui.announce
  * 类名: AnnounceListAdapter
  * 作用描述:
@@ -32,8 +33,21 @@ public class AnnounceListAdapter extends BaseQuickAdapter<AnnounceBean, BaseView
     @Override
     protected void convert(@NotNull BaseViewHolder holder, AnnounceBean item) {
 
+        holder.setText(R.id.tv_title, item.getTitle());
+
+        TextView tvContent = holder.getView(R.id.tv_content);
+        // 内容超出20个字截取
+        String content = item.getContent();
+//        if (content != null && content.length() > 20)
+//            content = item.getContent().substring(0, 20) + "...";
+        tvContent.setText(Html.fromHtml(content, null, null));
+
+        holder.setText(R.id.tv_source, item.getPublishOrgName());
+        holder.setText(R.id.tv_time, item.getPublishTime());
+
         //未读标记的显示/隐藏
-        holder.getView(R.id.v_flag).setVisibility(item.isRead ? View.INVISIBLE : View.VISIBLE);
+        boolean state = item.getReadStatus() == null ? false : item.getReadStatus();
+        holder.getView(R.id.v_flag).setVisibility(state ? View.INVISIBLE : View.VISIBLE);
     }
 
 }

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

@@ -1,14 +1,18 @@
 package com.unis.sxzcl.ui.announce;
 
-import android.os.Handler;
+import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
+import com.unis.model.AnnounceModel;
+import com.unis.model.DataCallback;
 import com.unis.model.bean.AnnounceBean;
 import com.unis.sxzcl.R;
 import com.unis.sxzcl.base.BaseListFragment;
 import com.unis.sxzcl.databinding.FragmentBaseListTitleBinding;
 
+import java.util.List;
+
 /**
  * 包名: com.unis.sxzcl.ui.announce
  * 类名: AnnounceListFragment
@@ -48,7 +52,10 @@ public class AnnounceListFragment extends BaseListFragment<FragmentBaseListTitle
 
         mAdapter = new AnnounceListAdapter();
         mAdapter.setOnItemClickListener((adapter, view, position) -> {
-            navigation(R.id.announceDetailFragment);
+            AnnounceBean item = mAdapter.getData().get(position);
+            Bundle bundle = new Bundle();
+            bundle.putString("data", getGson().toJson(item));
+            navigation(R.id.announceDetailFragment, bundle);
         });
 
         initBaseListView(mBinding.refreshLayout, mBinding.recyclerView, mAdapter, true);
@@ -59,26 +66,32 @@ public class AnnounceListFragment extends BaseListFragment<FragmentBaseListTitle
         onRefresh();
     }
 
+    private int page = 1;
+
     private void getData(boolean refresh) {
-        new Handler().postDelayed(() -> {
-//            //大于30到结尾
-//            if (mAdapter.getData().size() == 20) {
-//                loadEnd();
-//                return;
-//            }
-            if (refresh) {
-                mAdapter.getData().clear();
-                mAdapter.notifyDataSetChanged();
-            }
+        if (refresh) page = 1;
+        else page++;
+        AnnounceModel.get().getList(page, new DataCallback<List<AnnounceBean>>() {
+            @Override
+            public void onSuccess(List<AnnounceBean> data) {
+                if (!isActive()) return;
 
-            //模拟数据
-            mAdapter.addData(new AnnounceBean(false));
-            mAdapter.addData(new AnnounceBean(true));
-            mAdapter.addData(new AnnounceBean(true));
-            mAdapter.addData(new AnnounceBean(true));
+                if (page == 1) mAdapter.setList(data);
+                else mAdapter.addData(data);
 
-            loadEnd();
-        }, 500);
+                if (data.size() == 0) loadEnd();
+                else loadComplete();
+
+            }
+
+            @Override
+            public void onError(String error) {
+                super.onError(error);
+                if (!isActive()) return;
+                loadError();
+            }
+        });
     }
 
+
 }

app/src/main/java/com/unis/sxzcl/ui/basic/BasicFragment.java

@@ -26,7 +26,8 @@ import java.util.List;
  */
 public class BasicFragment extends BaseFragment<FragmentBaseTabPagerBinding> {
 
-    private List<String> mTabs = Arrays.asList("人员结构", "政策制度");
+//    private List<String> mTabs = Arrays.asList("人员结构", "政策制度");
+    private List<String> mTabs = Arrays.asList("人员结构");
     private List<Fragment> mFragments;
 
     @Override
@@ -50,7 +51,7 @@ public class BasicFragment extends BaseFragment<FragmentBaseTabPagerBinding> {
     private void initFragment() {
         mFragments = new ArrayList<>();
         mFragments.add(new PersonFrameFragment());
-        mFragments.add(new PolicyListFragment());
+//        mFragments.add(new PolicyListFragment());
     }
 
     @Override

app/src/main/java/com/unis/sxzcl/ui/basic/PersonDetailFragment.java

@@ -16,6 +16,10 @@ import com.unis.sxzcl.databinding.FragmentPersonDetailBinding;
 import com.unis.sxzcl.util.CallUtils;
 import com.xyxsbj.mylibrary.tool.ETTool;
 import com.xyxsbj.mylibrary.tool.ToastTool;
+import com.yanzhenjie.album.Album;
+import com.yanzhenjie.album.api.widget.Widget;
+
+import java.util.ArrayList;
 
 /**
  * 包名: com.unis.sxzcl.ui.basic
@@ -31,6 +35,7 @@ import com.xyxsbj.mylibrary.tool.ToastTool;
 public class PersonDetailFragment extends BaseFragment<FragmentPersonDetailBinding> {
 
     private String mId, mHouseId;
+    private String mHeadImg;
 
     public static PersonDetailFragment newFragment(boolean showTitle, String id, String houseId) {
         Bundle bundle = new Bundle();
@@ -63,6 +68,10 @@ public class PersonDetailFragment extends BaseFragment<FragmentPersonDetailBindi
             CallUtils.callPhone(getContext(), phone);
         });
 
+        mBinding.ivShow.setOnClickListener(v -> {
+            if (mHeadImg == null) return;
+            showBigImg(mHeadImg);
+        });
     }
 
     @Override
@@ -95,8 +104,10 @@ public class PersonDetailFragment extends BaseFragment<FragmentPersonDetailBindi
 
             mBinding.bar.setTitle(data.getUname());
 
+            mHeadImg = UrlPath.image_host + data.getPheadPortrait();
+
             Glide.with(getContext())
-                    .load(UrlPath.image_host + data.getPheadPortrait())
+                    .load(mHeadImg)
                     .placeholder(R.drawable.ic_img_loading)
                     .error(R.drawable.ic_user_empty)
                     .into(mBinding.ivShow);
@@ -116,5 +127,20 @@ public class PersonDetailFragment extends BaseFragment<FragmentPersonDetailBindi
         }
     };
 
+    private void showBigImg(String title, ArrayList<String> list) {
+        Widget widget = Widget.newLightBuilder(getContext())
+                .title(title).build();
+        Album.gallery(getContext())
+                .checkedList(list)
+                .widget(widget)
+                .start();
+    }
+
+    private void showBigImg(String path) {
+        ArrayList<String> list = new ArrayList<>();
+        list.add(path);
+        showBigImg("头像", list);
+    }
+
 
 }

app/src/main/java/com/unis/sxzcl/ui/basic/PersonFrameFragment.java

@@ -34,6 +34,7 @@ import java.util.List;
 public class PersonFrameFragment extends BaseListFragment<FragmentBaseListBinding> implements MultiListAdapter.Callback {
 
     private MultiListAdapter mAdapter;
+    private MultiDepotBean mDepot;
 
 
     @Override
@@ -51,6 +52,12 @@ public class PersonFrameFragment extends BaseListFragment<FragmentBaseListBindin
 
     @Override
     protected void onFirstShow() {
+        mDepot = DepotModel.get().getSelectDepot();
+        if (mDepot == null) {
+            ToastTool.showLong("请先选择库");
+            onBack();
+            return;
+        }
         onRefresh();
     }
 
@@ -65,26 +72,17 @@ public class PersonFrameFragment extends BaseListFragment<FragmentBaseListBindin
         }
     }
 
-
     @Override
     public void onRefreshData() {
-
         getData();
     }
 
     public void getData() {
-        MultiDepotBean depot = DepotModel.get().getSelectDepot();
-        if (depot == null) {
-            ToastTool.showLong("请先选择库");
-            onBack();
-            return;
-        }
-        showProgress("正在加载...", false);
-        UserModel.get().getPersonTree(depot.depotCode.toString(), new DataCallback<List<PersonTreeBean>>() {
+
+        UserModel.get().getPersonTree(mDepot.depotCode.toString(), new DataCallback<List<PersonTreeBean>>() {
             @Override
             public void onSuccess(List<PersonTreeBean> data) {
                 if (!isActive()) return;
-                hideProgress();
 
                 List<BaseNode> list = new ArrayList<>();
                 int index = 0;

app/src/main/java/com/unis/sxzcl/ui/basic/PolicyListFragment.java

@@ -70,10 +70,10 @@ public class PolicyListFragment extends BaseListFragment<FragmentBaseListBinding
             }
 
             //模拟数据
-            mAdapter.addData(new AnnounceBean(false));
-            mAdapter.addData(new AnnounceBean(true));
-            mAdapter.addData(new AnnounceBean(true));
-            mAdapter.addData(new AnnounceBean(true));
+            mAdapter.addData(new AnnounceBean());
+            mAdapter.addData(new AnnounceBean());
+            mAdapter.addData(new AnnounceBean());
+            mAdapter.addData(new AnnounceBean());
 
             loadEnd();
         }, 500);

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

@@ -1,7 +1,6 @@
 package com.unis.sxzcl.ui.home;
 
 import android.os.Bundle;
-import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -9,11 +8,13 @@ import android.view.ViewGroup;
 import com.bumptech.glide.Glide;
 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.NoticeModel;
 import com.unis.model.ProcessModel;
 import com.unis.model.UrlPath;
 import com.unis.model.UserModel;
+import com.unis.model.bean.AnnounceBean;
 import com.unis.model.bean.UserBean;
 import com.unis.model.event.TodoEvent;
 import com.unis.sxzcl.R;
@@ -61,11 +62,7 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
         EventBus.getDefault().register(this);
         mBinding.vStatus.setHeight(getStatusHeight());
 
-        initRefreshView(mBinding.refreshLayout, () -> {
-            // TODO: 2020/11/10 刷新数据
-            new Handler().postDelayed(() -> mBinding.refreshLayout.setRefreshing(false), 500);
-            onTodoEvent(new TodoEvent());
-        });
+        initRefreshView(mBinding.refreshLayout, this::getData);
 
         mBinding.ivNotice.setOnClickListener(v -> {
             // 通知
@@ -103,9 +100,6 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
         // 初始化轮播图
         initBanner();
 
-        // 初始化标签
-        initNotice();
-
     }
 
     @Override
@@ -116,7 +110,12 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
 
     @Override
     protected void onFirstShow() {
-//        getRole();
+        getData();
+    }
+
+
+    // 获取数据
+    private void getData() {
         getHouseStatus();
         getFoodType();
         getStorageStatus();
@@ -130,10 +129,12 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
                 .error(R.drawable.ic_user_empty)
                 .into(mBinding.ivUser);
 
-        onTodoEvent(new TodoEvent());
-
+        getTodoCount();
+        getNoticeCount();
+        getAnnounceList();
     }
 
+
     /**
      * 初始化轮播图
      */
@@ -146,60 +147,6 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
         mBannerUtils.setImagesResId(list);
     }
 
-    /**
-     * 初始化标签
-     */
-    private void initNotice() {
-
-        List<String> bannerData = new ArrayList<>();
-        for (int i = 0; i < 9; i++) {
-            bannerData.add("这是一条公告");
-        }
-        mBinding.announceBanner.setAdapter(new TopLineAdapter(bannerData))
-                .isAutoLoop(true)
-                .setOrientation(Banner.VERTICAL)
-                .setUserInputEnabled(false)
-//                .setLoopTime(2000)
-                .setPageTransformer(new ZoomOutPageTransformer())
-                .setOnBannerListener((data, position) -> {
-                    // 公告
-                    navigation(R.id.announceListFragment);
-                })
-        ;
-
-    }
-
-
-    /**
-     * 获取工作台数据
-     */
-//    private void getRole() {
-//        String role = UserModel.get().getRole();// 获取角色
-//        if (role == null) return;
-//        //获取工作台数据
-//        switch (role) {
-//            case UserModel.Role.TYPE_FGS:
-//                getHouseStatus();
-//                getFoodType();
-//                getStorageStatus();
-////                WorkbenchModel.get().getFgsList(workbenchCallback);
-//                break;
-//            case UserModel.Role.TYPE_KLD:
-//                getHouseStatus();
-//                getFoodType();
-//                getStorageStatus();
-////                WorkbenchModel.get().getKzList(workbenchCallback);
-//                break;
-//            case UserModel.Role.TYPE_BGY:
-//                mBinding.layoutCompany.setVisibility(View.GONE);
-//                mBinding.layoutCount.setVisibility(View.GONE);
-//                mBinding.layoutHouseStatus.setVisibility(View.GONE);
-//                mBinding.layoutFoodType.setVisibility(View.GONE);
-//                mBinding.layoutStorageStatus.setVisibility(View.GONE);
-//                mWorkbenchAdapter.addData(WorkbenchModel.get().mHomeList);
-//                break;
-//        }
-//    }
     private void getHouseStatus() {
         if (mPieChartHouseStatus == null)
             mPieChartHouseStatus = new MyPieChart(mBinding.pieHouseStatus);
@@ -238,14 +185,26 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
     }
 
 
+    /**
+     * 收到消息 刷新待办数量
+     *
+     * @param event
+     */
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onTodoEvent(TodoEvent event) {
-        // 待办事项数量
-        ProcessModel.get().getTodoSize(new DataCallback<Integer>() {
+        getTodoCount();
+    }
+
+    /**
+     * 获取待办数量
+     */
+    private void getTodoCount() {
+        ProcessModel.get().getTodoCount(new DataCallback<Integer>() {
             @Override
             public void onSuccess(Integer data) {
-                if (!isActive())return;
+                if (!isActive()) return;
 
+                mBinding.refreshLayout.setRefreshing(false);
                 if ((int) data == 0) {
                     mBinding.tvTodoCount.setVisibility(View.GONE);
                     return;
@@ -254,12 +213,16 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
                 mBinding.tvTodoCount.setText(data + "");
             }
         });
+    }
 
-        // 通知数量
-        NoticeModel.get().getNoticeSize(new DataCallback<Integer>() {
+    /**
+     * 获取通知数量
+     */
+    private void getNoticeCount() {
+        NoticeModel.get().getNoticeCount(new DataCallback<Integer>() {
             @Override
             public void onSuccess(Integer data) {
-                if (!isActive())return;
+                if (!isActive()) return;
 
                 if ((int) data == 0) {
                     mBinding.tvNoticeCount.setVisibility(View.GONE);
@@ -271,4 +234,33 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
         });
     }
 
+    /**
+     * 获取公告列表
+     * 获取第一页的公告进行轮播
+     */
+    private void getAnnounceList() {
+        AnnounceModel.get().getList(1, new DataCallback<List<AnnounceBean>>() {
+            @Override
+            public void onSuccess(List<AnnounceBean> data) {
+                if (!isActive()) return;
+
+                if (data.size() == 0) return;
+
+                //  展示公告轮播
+                mBinding.announceBanner.setAdapter(new TopLineAdapter(data))
+                        .isAutoLoop(true)
+                        .setOrientation(Banner.VERTICAL)
+                        .setUserInputEnabled(false)
+//                .setLoopTime(2000)
+                        .setPageTransformer(new ZoomOutPageTransformer())
+                        .setOnBannerListener((item, position) -> {
+                            // 公告
+                            navigation(R.id.announceListFragment);
+                        })
+                ;
+            }
+        });
+    }
+
+
 }

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

@@ -57,7 +57,7 @@ public class MainActivity extends BaseActivity<ActivityMainBinding> {
                 BasicModel.get().getHouseDictionary();
                 BasicModel.get().getPersonDictionary();
             }
-        }, 2000);
+        }, 1000);
 
     }
 

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

@@ -17,12 +17,18 @@ import com.unis.model.event.LoginOutEvent;
 import com.unis.sxzcl.R;
 import com.unis.sxzcl.base.BaseFragment;
 import com.unis.sxzcl.databinding.FragmentUserBinding;
+import com.unis.sxzcl.util.MyCompressHelper;
+import com.xyxsbj.mylibrary.tool.ToastTool;
 import com.xyxsbj.mylibrary.tool.VersionTool;
 import com.yanzhenjie.album.Album;
 import com.yanzhenjie.album.api.widget.Widget;
 
 import org.greenrobot.eventbus.EventBus;
 
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
 import static com.unis.model.UrlPath.image_host;
 
 /**
@@ -38,6 +44,8 @@ import static com.unis.model.UrlPath.image_host;
  */
 public class UserFragment extends BaseFragment<FragmentUserBinding> {
 
+    private UserBean mUser;
+
     @Override
     protected FragmentUserBinding getViewBinding(LayoutInflater inflater, ViewGroup container) {
         return FragmentUserBinding.inflate(inflater, container, false);
@@ -80,18 +88,18 @@ public class UserFragment extends BaseFragment<FragmentUserBinding> {
         loadUpdate();
 
         //展示用户信息
-        UserBean user = UserModel.get().getUser();
-        if (user == null) return;
+        mUser = UserModel.get().getUser();
+        if (mUser == null) return;
         Glide.with(getContext())
-                .load(image_host + user.getPheadPortrait())
+                .load(image_host + mUser.getPheadPortrait())
                 .placeholder(R.drawable.ic_img_loading)
                 .error(R.drawable.ic_user_empty)
                 .into(mBinding.ivHead);
-        mBinding.tvLoginName.setText(user.getUname());
-        mBinding.tvName.setText(user.getPersonnelName());
-        mBinding.tvCompany.setText(user.getCompanyName());
-        mBinding.tvDepartment.setText(user.getDepotName());
-        mBinding.tvPost.setText(user.getPpost());
+        mBinding.tvLoginName.setText(mUser.getUname());
+        mBinding.tvName.setText(mUser.getPersonnelName());
+        mBinding.tvCompany.setText(mUser.getCompanyName());
+        mBinding.tvDepartment.setText(mUser.getDepotName());
+        mBinding.tvPost.setText(mUser.getPpost());
     }
 
     /**
@@ -147,7 +155,8 @@ public class UserFragment extends BaseFragment<FragmentUserBinding> {
                             .error(R.drawable.ic_user_empty)
                             .into(mBinding.ivHead);
                     //图片压缩
-//                    mNewHead = MyCompressHelper.get(getContext()).compressToFile(new File(result.get(0).getPath()));
+                    File newHead = MyCompressHelper.get(getContext()).compressToFile(new File(result.get(0).getPath()));
+                    uploadImage(newHead);
                 }).start();
     }
 
@@ -179,4 +188,55 @@ public class UserFragment extends BaseFragment<FragmentUserBinding> {
             }
         });
     }
+
+    /**
+     * 上传图片
+     */
+    public void uploadImage(File file) {
+        if (file == null) return;
+        showProgress("正在上传图片...", false);
+        UserModel.get().uploadFile(file, new DataCallback<String>() {
+            @Override
+            public void onSuccess(String data) {
+                if (!isActive()) return;
+                if (data != null) {
+                    update(data);
+                }
+            }
+
+            @Override
+            public void onError(String error) {
+                super.onError(error);
+                if (!isActive()) return;
+                hideProgress();
+            }
+        });
+    }
+
+    /**
+     * 修改头像
+     */
+    public void update(String headImg) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("pheadPortrait", headImg);
+        map.put("pid", mUser.getPersonnelId());
+        showProgress("正在修改信息...", false);
+        UserModel.get().update(map, new DataCallback<String>() {
+            @Override
+            public void onSuccess(String data) {
+                if (!isActive()) return;
+                hideProgress();
+                ToastTool.showLong("头像修改成功!");
+            }
+
+            @Override
+            public void onError(String error) {
+                super.onError(error);
+                if (!isActive()) return;
+                hideProgress();
+            }
+        });
+    }
+
+
 }

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

@@ -1,4 +1,4 @@
-package com.unis.model.bean;
+package com.unis.sxzcl.ui.work_module;
 
 /**
  * 包名: com.unis.model
@@ -20,9 +20,9 @@ public class WorkModule {
     private String title;
 
     //图标
-    private String img;
+    private int img;
 
-    public WorkModule(String title, String img) {
+    public WorkModule(String title, int img) {
         this.title = title;
         this.img = img;
     }
@@ -43,11 +43,11 @@ public class WorkModule {
         this.title = title;
     }
 
-    public String getImg() {
+    public int getImg() {
         return img;
     }
 
-    public void setImg(String img) {
+    public void setImg(int img) {
         this.img = img;
     }
 }

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

@@ -9,10 +9,8 @@ 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.WorkbenchModel;
 import com.unis.model.bean.HouseListBean;
 import com.unis.model.bean.MultiDepotBean;
-import com.unis.model.bean.WorkModule;
 import com.unis.sxzcl.R;
 import com.unis.sxzcl.widget.BottomMultipleListDialog;
 import com.unis.sxzcl.widget.MultipleBean;
@@ -54,7 +52,7 @@ public class WorkModuleAdapter extends BaseQuickAdapter<WorkModule, BaseViewHold
         holder.setText(R.id.tv_title, item.getTitle());
 
         Glide.with(getContext())
-                .load(R.mipmap.ic_launcher)
+                .load(item.getImg())
                 .placeholder(R.drawable.ic_img_loading)
                 .error(R.drawable.no_banner)
                 .into((ImageView) holder.getView(R.id.iv_show));

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

@@ -9,9 +9,7 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.unis.model.DepotModel;
-import com.unis.model.WorkbenchModel;
 import com.unis.model.bean.MultiDepotBean;
-import com.unis.model.bean.WorkModule;
 import com.unis.model.event.SelectDepotEvent;
 import com.unis.sxzcl.R;
 import com.unis.sxzcl.base.BaseListFragment;

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

@@ -1,6 +1,6 @@
-package com.unis.model;
+package com.unis.sxzcl.ui.work_module;
 
-import com.unis.model.bean.WorkModule;
+import com.unis.sxzcl.R;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -71,9 +71,9 @@ public class WorkbenchModel {
     /******************* 主功能列表 ********************/
 
     public List<WorkModule> mHomeList = Arrays.asList(
-            new WorkModule(TYPE_JBXX, ""),
-            new WorkModule(TYPE_SLZL, ""),
-            new WorkModule(TYPE_CLGL, "")
+            new WorkModule(TYPE_JBXX, R.drawable.ic_model_jbxx),
+            new WorkModule(TYPE_SLZL, R.drawable.ic_model_slzl),
+            new WorkModule(TYPE_CLGL, R.drawable.ic_model_clgl)
 //            new WorkModule(TYPE_YJGL, ""),
 //            new WorkModule(TYPE_SSSB, ""),
 //            new WorkModule(TYPE_AQSC, ""),
@@ -87,28 +87,28 @@ public class WorkbenchModel {
     public Map<String, List<WorkModule>> mChildMap = new HashMap() {
         {
             put(TYPE_SLZL, Arrays.asList(
-                    new WorkModule(TYPE_CFXX, "")
+                    new WorkModule(TYPE_CFXX, R.mipmap.ic_launcher)
 //                    new WorkModule(TYPE_RKZL, ""),
 //                    new WorkModule(TYPE_KCZL, ""),
 //                    new WorkModule(TYPE_CKZL, "")
             ));
             put(TYPE_CLGL, Arrays.asList(
-                    new WorkModule(TYPE_LQJC, ""),
-                    new WorkModule(TYPE_JXTF, "")
+                    new WorkModule(TYPE_LQJC, R.mipmap.ic_launcher),
+                    new WorkModule(TYPE_JXTF, R.mipmap.ic_launcher)
 //                    new WorkModule(TYPE_XZGL, "")
             ));
             put(TYPE_YJGL, Arrays.asList(
-                    new WorkModule(TYPE_YJCG, ""),
-                    new WorkModule(TYPE_YJBG, ""),
-                    new WorkModule(TYPE_YJLY, "")
+                    new WorkModule(TYPE_YJCG, R.mipmap.ic_launcher),
+                    new WorkModule(TYPE_YJBG, R.mipmap.ic_launcher),
+                    new WorkModule(TYPE_YJLY, R.mipmap.ic_launcher)
             ));
             put(TYPE_SSSB, Arrays.asList(
-                    new WorkModule(TYPE_SSGL, ""),
-                    new WorkModule(TYPE_SBGL, "")
+                    new WorkModule(TYPE_SSGL, R.mipmap.ic_launcher),
+                    new WorkModule(TYPE_SBGL, R.mipmap.ic_launcher)
             ));
             put(TYPE_KWGL, Arrays.asList(
-                    new WorkModule(TYPE_ZCGL, ""),
-                    new WorkModule(TYPE_WTGL, "")
+                    new WorkModule(TYPE_ZCGL, R.mipmap.ic_launcher),
+                    new WorkModule(TYPE_WTGL, R.mipmap.ic_launcher)
             ));
         }
     };

app/src/main/java/com/unis/sxzcl/util/MyCompressHelper.java

@@ -0,0 +1,27 @@
+package com.unis.sxzcl.util;
+
+import android.content.Context;
+
+import com.nanchen.compresshelper.CompressHelper;
+
+/**
+ * 包名: com.bskapp.bskapp.util
+ * 类名: MyCompressHelper
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2020/8/28 16:16
+ * 更新人:
+ * 更新时间: 2020/8/28 16:16
+ * 更新说明:
+ * 版本号: 1.0
+ */
+public class MyCompressHelper {
+
+    public static CompressHelper get(Context context) {
+        return new CompressHelper.Builder(context)
+                .setMaxHeight(1920.0f)//最大高度
+                .setMaxWidth(1920.0f)//最大宽度
+                .setQuality(80)//质量
+                .build();
+    }
+}

app/src/main/java/com/unis/sxzcl/widget/banner/TopLineAdapter.java

@@ -2,10 +2,12 @@ package com.unis.sxzcl.widget.banner;
 
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.unis.model.bean.AnnounceBean;
 import com.unis.sxzcl.R;
 import com.youth.banner.adapter.BannerAdapter;
 import com.youth.banner.util.BannerUtils;
@@ -14,7 +16,6 @@ import java.util.List;
 
 
 /**
- *
  * 包名: com.unis.sxzcl.widget.banner
  * 类名: TopLineAdapter
  * 作用描述: 纵向轮播适配器
@@ -25,10 +26,10 @@ import java.util.List;
  * 更新说明:
  * 版本号: 1.0
  */
-public class TopLineAdapter extends BannerAdapter<String, TopLineAdapter.TopLineHolder> {
+public class TopLineAdapter extends BannerAdapter<AnnounceBean, TopLineAdapter.TopLineHolder> {
 
-    public TopLineAdapter(List<String> mDatas) {
-        super(mDatas);
+    public TopLineAdapter(List<AnnounceBean> list) {
+        super(list);
     }
 
     @Override
@@ -37,25 +38,19 @@ public class TopLineAdapter extends BannerAdapter<String, TopLineAdapter.TopLine
     }
 
     @Override
-    public void onBindView(TopLineHolder holder, String data, int position, int size) {
-//        holder.message.setText(data.title);
-//        if (data.viewType==1) {
-//            holder.source.setText("1号店");
-//        }else if (data.viewType==2) {
-//            holder.source.setText("淘宝头条");
-//        }else if (data.viewType==3) {
-//            holder.source.setText("京东快报");
-//        }
+    public void onBindView(TopLineHolder holder, AnnounceBean data, int position, int size) {
+        holder.tvTitle.setText(data.getTitle());
+        holder.tvTime.setText(data.getPublishTime());
     }
 
     class TopLineHolder extends RecyclerView.ViewHolder {
-//        public TextView message;
-//////        public TextView source;
+        public TextView tvTitle;
+        public TextView tvTime;
 
         public TopLineHolder(@NonNull View view) {
             super(view);
-//            message=view.findViewById(R.id.message);
-//            source=view.findViewById(R.id.source);
+            tvTitle = view.findViewById(R.id.tv_title);
+            tvTime = view.findViewById(R.id.tv_time);
         }
     }
 }

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

@@ -56,7 +56,7 @@
         android:gravity="center"
         android:minHeight="48dp"
         android:textColor="@android:color/white"
-        android:textSize="?attr/textSizeXXXX"
+        android:textSize="?attr/textSizeXXXXX"
         android:textStyle="bold" />
 
 </RelativeLayout>

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

@@ -3,17 +3,60 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/colorWhite"
     android:orientation="vertical">
 
     <com.unis.sxzcl.widget.BaseTitleBar
         android:id="@+id/bar"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="16dp"
+        android:text="标题"
+        android:textColor="@color/colorTheme"
+        android:textSize="?attr/textSizeXXXX" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:barTitle="公告" />
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="8dp">
+
+        <TextView
+            android:id="@+id/tv_source"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="公司"
+            android:textColor="@color/colorText99"
+            android:textSize="?attr/textSizeX" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+        <TextView
+            android:id="@+id/tv_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="时间"
+            android:textColor="@color/colorText99"
+            android:textSize="?attr/textSizeX" />
+    </LinearLayout>
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:scrollbars="vertical">
 
         <com.tencent.smtt.sdk.WebView
             android:id="@+id/web_view"

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

@@ -18,28 +18,39 @@
 
     <TextView
         android:id="@+id/tv_title"
-        style="@style/text_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:layout_marginRight="16dp"
         android:layout_toRightOf="@id/v_flag"
-        android:text="粮食局发布《关于认真做好秋粮收购工作的通知》" />
+        android:text="标题"
+        android:textColor="@color/colorText33"
+        android:textSize="?attr/textSizeXX" />
 
     <TextView
         android:id="@+id/tv_content"
-        style="@style/text_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_below="@id/tv_title"
         android:layout_alignLeft="@id/tv_title"
         android:layout_marginTop="8dp"
         android:layout_marginRight="16dp"
-        android:text="目前，夏粮和早稻收购工作已基本结束，秋粮收购工作即将全面展开。为认真贯彻落实国务院第194次常务会议精神，切..." />
+        android:ellipsize="end"
+        android:maxLines="3"
+        android:text="内容"
+        android:textColor="@color/colorText55"
+        android:textSize="?attr/textSizeXX" />
 
     <TextView
         android:id="@+id/tv_source"
-        style="@style/text_accent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_below="@id/tv_content"
         android:layout_alignLeft="@id/tv_content"
         android:layout_marginTop="8dp"
-        android:text="总经办" />
+        android:text="公司"
+        android:textColor="@color/colorText99"
+        android:textSize="?attr/textSizeX" />
 
     <TextView
         android:id="@+id/tv_time"
@@ -48,6 +59,8 @@
         android:layout_alignParentRight="true"
         android:layout_marginRight="16dp"
         android:layout_marginBottom="16dp"
-        android:text="2020-12-12 11:00" />
+        android:text="时间"
+        android:textColor="@color/colorText99"
+        android:textSize="?attr/textSizeX" />
 
 </RelativeLayout>

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

@@ -7,12 +7,20 @@
     android:orientation="horizontal">
 
     <LinearLayout
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="1"
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="40dp" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -26,7 +34,6 @@
                 android:id="@+id/iv_show"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="40dp"
                 android:layout_weight="1.5"
                 android:adjustViewBounds="true"
                 android:src="@drawable/no_banner" />

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

@@ -30,16 +30,6 @@ public abstract class MyStringCallback extends StringCallback {
     @Override
     public void onStart(Request<String, ? extends Request> request) {
         super.onStart(request);
-//        String headToken = UserModel.get().getHeadToken();
-//        if (headToken != null) {
-//            request.headers("Authorization", headToken);
-//
-//            HttpUrl httpUrl = HttpUrl.parse(UrlPath.host);
-//            Cookie.Builder builder = new Cookie.Builder();
-//            Cookie cookieToken = builder.name("Token").value(headToken).domain(httpUrl.host()).build();
-//            CookieStore cookieStore = OkGo.getInstance().getCookieJar().getCookieStore();
-//            cookieStore.saveCookie(httpUrl, cookieToken);
-//        }
     }
 
     protected abstract void onSuccessResult(Response<String> response) throws JSONException;

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

@@ -77,7 +77,7 @@ public class NoticeModel {
     /**
      * 获取通知列表
      */
-    public void getNoticeSize(final DataCallback<Integer> callback) {
+    public void getNoticeCount(final DataCallback<Integer> callback) {
         Map<String, Object> condition = new HashMap<>();
         condition.put("readStatus", false);
         Map<String, Object> map = new HashMap<>();

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

@@ -305,7 +305,7 @@ public class ProcessModel {
     /**
      * 待处理 数量
      */
-    public void getTodoSize(final DataCallback<Integer> callBack) {
+    public void getTodoCount(final DataCallback<Integer> callBack) {
         Gson gson = new Gson();
         Map<String, Object> map = new HashMap<>();
         map.put("pageIndex", 1);

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

@@ -19,6 +19,8 @@ public class UrlPath {
 
     //图片地址
     public static final String image_host = host + "/api/csc-szls-system-manage/minio/preViewPicture/";
+    // 上传图片
+    public static final String upload_file = host + "/api/csc-szls-system-manage//minio/testupload";
 
     //版本信息
     public static final String version_info = host + "/apk/version_info.json";
@@ -59,10 +61,13 @@ public class UrlPath {
     public static final String person_detail = host + "/api/csc-szls-system-manage/sysPersonnel/authority/getById";
     // 人员详情 仓房id
     public static final String person_detail_by_house = host + "/api/csc-szls-system-manage/sysPersonnel/authority/getByWarehouseId";
+    // 修改人员信息
+    public static final String person_update = host + "/api/csc-szls-system-manage/sysPersonnel/authority_button/update";
     // 人员字典
     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";

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

@@ -8,6 +8,7 @@ import com.lzy.okgo.OkGo;
 import com.lzy.okgo.cookie.store.CookieStore;
 import com.lzy.okgo.model.Response;
 import com.lzy.okgo.request.GetRequest;
+import com.lzy.okgo.request.PostRequest;
 import com.lzy.okgo.request.base.Request;
 import com.unis.model.bean.LoginBean;
 import com.unis.model.bean.UserBean;
@@ -18,6 +19,7 @@ import com.xyxsbj.mylibrary.tool.SPTool;
 
 import org.json.JSONException;
 
+import java.io.File;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.HashMap;
@@ -120,17 +122,11 @@ public class UserModel {
                         Cookie cookieToken = builder.name("Token").value(tokenType + "%20" + accessToken).domain(httpUrl.host()).build();
                         CookieStore cookieStore = OkGo.getInstance().getCookieJar().getCookieStore();
                         cookieStore.saveCookie(httpUrl, cookieToken);
-//                        cookieStore.saveCookie(httpUrl, cookie2);
 
                         CookieStore store = OkGo.getInstance().getCookieJar().getCookieStore();
                         List<Cookie> allCookie = store.getAllCookie();
                         LogTool.i("所有cookie如下：" + allCookie.toString());
 
-                        // 添加请求头
-//                        HttpHeaders headers = new HttpHeaders();
-//                        headers.put("Authorization", token);
-//                        OkGo.getInstance().init(BaseApp.getApp()).addCommonHeaders(headers);
-
                         if (callBack != null)
                             callBack.onSuccess(bean);
                     }
@@ -270,5 +266,50 @@ public class UserModel {
         });
     }
 
+    /**
+     * 图片上传
+     *
+     * @param file
+     * @param callback
+     */
+    public void uploadFile(File file, final DataCallback<String> callback) {
+        PostRequest<String> request = OkGo.post(UrlPath.upload_file);
+        request.params("file", file);
+        request.execute(new MyStringCallback() {
+            @Override
+            protected void onSuccessResult(Response<String> response) throws JSONException {
+                callback.onSuccess(getDataJson(response));
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                callback.onError(getErrorMsg(response));
+            }
+        });
+
+    }
+
+    /**
+     * 修改用户信息
+     */
+    public void update(Map<String, Object> userMap, final DataCallback<String> callback) {
+
+        PostRequest<String> request = OkGo.post(UrlPath.person_update);
+        request.upJson(new Gson().toJson(userMap));
+        request.execute(new MyStringCallback() {
+            @Override
+            protected void onSuccessResult(Response<String> response) throws JSONException {
+                callback.onSuccess(null);
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+                callback.onError(getErrorMsg(response));
+            }
+        });
+    }
+
 
 }

version_info.json

@@ -1,6 +1,14 @@
 {
   "info": [
     {
+      "versionName": "1.5",
+      "versionCode": 5,
+      "content": "1.作业功能修改图标\n2.增加公告列表与相亲\n3.增加修改头像功能",
+      "fileName": "sxzcl_release_1.4_4.apk",
+      "must": true,
+      "time": "2020-12-26"
+    },
+    {
       "versionName": "1.4",
       "versionCode": 4,
       "content": "1.修改桌面图标、页面字体、颜色样式等\n2.修改登录页\n3.等待动画调整\n4.修改部分bug\n5.完善仓房信息\n6.完善保管员信息\n7.解决登录bug",