1.优化公告阅读状态

2.优化通知阅读状态

app/src/main/java/com/unis/sxzcl/MyApp.java

@@ -23,7 +23,7 @@ public class MyApp extends BaseApp {
 
     @Override
     protected boolean isDebug() {
-        return true;
+        return BuildConfig.DEBUG;
     }
 
     @Override

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

@@ -484,7 +484,9 @@ public class AerationDetailFragment extends BaseListFragment<FragmentAerationDet
     @Override
     public void onSwitchListener(ProcessStepBean item) {
         // 流程切换回调方法
+        // 刷新列表
         mAdapter.setFlowId(item.id);
+
         mBinding.recyclerView.scrollToPosition(0);
 
         if (mStepAdapter.getCurrentIndex() == 0 && !mPageType.equals("add")) {

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

@@ -11,6 +11,10 @@ import com.unis.sxzcl.R;
 import com.unis.sxzcl.base.BaseListFragment;
 import com.unis.sxzcl.databinding.FragmentBaseListTitleBinding;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import java.util.List;
 
 /**
@@ -28,6 +32,7 @@ public class AnnounceListFragment extends BaseListFragment<FragmentBaseListTitle
 
     private AnnounceListAdapter mAdapter;
 
+    private AnnounceBean selectBean;
 
     @Override
     public void onRefreshData() {
@@ -47,12 +52,16 @@ public class AnnounceListFragment extends BaseListFragment<FragmentBaseListTitle
 
     @Override
     protected void init() {
+        EventBus.getDefault().register(this);
         mBinding.bar.setTitle("公告列表")
                 .setLeftClickListener(v -> onBack());
 
         mAdapter = new AnnounceListAdapter();
         mAdapter.setOnItemClickListener((adapter, view, position) -> {
             AnnounceBean item = mAdapter.getData().get(position);
+            selectBean = item;
+
+            // 跳转到详情
             Bundle bundle = new Bundle();
             bundle.putString("data", getGson().toJson(item));
             navigation(R.id.announceDetailFragment, bundle);
@@ -62,6 +71,12 @@ public class AnnounceListFragment extends BaseListFragment<FragmentBaseListTitle
     }
 
     @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Override
     protected void onFirstShow() {
         onRefresh();
     }
@@ -93,5 +108,20 @@ public class AnnounceListFragment extends BaseListFragment<FragmentBaseListTitle
         });
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onReadEvent(AnnounceBean event) {
+        if (event == null) {
+            onRefresh();
+            return;
+        }
+        for (AnnounceBean bean : mAdapter.getData()) {
+            if (bean.getId().equals(event.getId())) {
+                // 将刷新的选项置为已读
+                bean.setReadStatus(true);
+                mAdapter.notifyItemChanged(mAdapter.getItemPosition(bean));
+                break;
+            }
+        }
+    }
 
 }

app/src/main/java/com/unis/sxzcl/ui/notice/NoticeListAdapter.java

@@ -10,16 +10,11 @@ import com.unis.sxzcl.R;
 
 import org.jetbrains.annotations.NotNull;
 
+
 /**
- * 包名: com.unis.sxzcl.ui.notice
- * 类名: NoticeListAdapter
- * 作用描述:
+ * 通知列表Adapter
  * 创建人: mQ
- * 创建时间: 2020/11/24 11:28
- * 更新人:
- * 更新时间: 2020/11/24 11:28
- * 更新说明:
- * 版本号: 1.0
+ * 时间: 2020/11/24 11:28
  */
 public class NoticeListAdapter extends BaseQuickAdapter<NoticeBean, BaseViewHolder>
         implements LoadMoreModule {

app/src/main/java/com/unis/sxzcl/ui/notice/NoticeListFragment.java

@@ -8,6 +8,7 @@ import com.unis.model.NoticeModel;
 import com.unis.model.bean.notice.NoticeBean;
 import com.unis.sxzcl.base.BaseListFragment;
 import com.unis.sxzcl.databinding.FragmentBaseListTitleBinding;
+import com.xyxsbj.mylibrary.tool.ToastTool;
 
 import java.util.List;
 
@@ -54,8 +55,27 @@ public class NoticeListFragment extends BaseListFragment<FragmentBaseListTitleBi
         });
         mAdapter.setReadCallback(item -> {
             // 处理已读
-//            item.read = true;
-//            mAdapter.notifyItemChanged(mAdapter.getItemPosition(item));
+
+            showProgress("正在阅读...", false);
+            String id = "";
+            if (item.getId() != null) id = item.getId().toString();
+            NoticeModel.get().read(id, new DataCallback<String>() {
+                @Override
+                public void onSuccess(String data) {
+                    if (!isActive()) return;
+                    hideProgress();
+                    ToastTool.showLong("已读成功");
+                    item.setReadStatus(true);
+                    mAdapter.notifyItemChanged(mAdapter.getItemPosition(item));
+                }
+
+                @Override
+                public void onError(String error) {
+                    super.onError(error);
+                    if (!isActive()) return;
+                    hideProgress();
+                }
+            });
         });
         initBaseListView(mBinding.refreshLayout, mBinding.recyclerView, mAdapter, true);
     }

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

@@ -11,7 +11,6 @@ import android.widget.TextView;
 
 import com.unis.sxzcl.R;
 import com.unis.sxzcl.databinding.BaseTitleBarBinding;
-import com.xyxsbj.mylibrary.tool.LogTool;
 import com.xyxsbj.mylibrary.tool.StringTool;
 
 /**
@@ -96,7 +95,7 @@ public class BaseTitleBar extends RelativeLayout {
             //根据资源ID获取响应的尺寸值
             height = getResources().getDimensionPixelSize(resourceId);
         }
-        LogTool.i("状态栏高度:" + height);
+//        LogTool.i("状态栏高度:" + height);
         return height;
     }
 

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

@@ -44,7 +44,7 @@ public class MyPieChart {
 
     private void initView() {
         //边距
-        mPieChart.setExtraOffsets(10, 10, 10, 10);
+        mPieChart.setExtraOffsets(0, 15, 0, 15);
         // 设置pieChart图表展示动画效果
         mPieChart.animateY(1000);
         //无数据时显示文字

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

@@ -9,6 +9,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.unis.model.bean.AnnounceBean;
 import com.unis.sxzcl.R;
+import com.xyxsbj.mylibrary.tool.DateTool;
 import com.youth.banner.adapter.BannerAdapter;
 import com.youth.banner.util.BannerUtils;
 
@@ -40,7 +41,12 @@ public class TopLineAdapter extends BannerAdapter<AnnounceBean, TopLineAdapter.T
     @Override
     public void onBindView(TopLineHolder holder, AnnounceBean data, int position, int size) {
         holder.tvTitle.setText(data.getTitle());
-        holder.tvTime.setText(data.getPublishTime());
+        String publishTime = data.getPublishTime();
+        try {
+            publishTime = DateTool.formatDate(publishTime, DateTool.GLNZSJ_DATE, DateTool.YTDTD_DATE);
+        } catch (Exception e) {
+        }
+        holder.tvTime.setText(publishTime);
     }
 
     class TopLineHolder extends RecyclerView.ViewHolder {

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

@@ -5,14 +5,11 @@ import android.content.DialogInterface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
 
 import com.unis.sxzcl.R;
+import com.unis.sxzcl.databinding.DialogSystemBinding;
 
 
 /**
@@ -24,16 +21,7 @@ import com.unis.sxzcl.R;
 public class SystemDialog {
 
     AlertDialog mDialog;
-
-    private TextView mTvTitle;
-    private ImageView mBtnClose;
-    private TextView mTvMsg;
-    private FrameLayout mContentLayout;
-    private View mViewBottomLine;
-    private TextView mBtnLeft;
-    private TextView mBtnCenter;
-    private TextView mBtnRight;
-    private LinearLayout mRootLayout;
+    private DialogSystemBinding mBinding;
 
     private LeftCallBack mLeftCallBack;
     private CenterCallBack mCenterCallBack;
@@ -47,44 +35,34 @@ public class SystemDialog {
 
     private void initDialog(Context context) {
         mDialog = new AlertDialog.Builder(context, R.style.MyDialog).create();
-        View view = LayoutInflater.from(context).inflate(R.layout.dialog_system, null, false);
-        mDialog.setView(view);
+        mBinding = DialogSystemBinding.inflate(LayoutInflater.from(context));
+        mDialog.setView(mBinding.getRoot());
         mDialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
         mDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-        initView(view);
+        initView();
     }
 
-    private void initView(View view) {
-        mTvTitle = view.findViewById(R.id.tv_title);
-        mTvTitle.setText("");
-
-        mBtnClose = view.findViewById(R.id.btn_close);
-        mBtnClose.setOnClickListener(mClickListener);
+    private void initView() {
+        mBinding.tvTitle.setText("");
 
-        mTvMsg = view.findViewById(R.id.tv_msg);
-        mTvMsg.setVisibility(View.GONE);
+        mBinding.btnClose.setOnClickListener(mClickListener);
 
-        mContentLayout = view.findViewById(R.id.content_layout);
-        mContentLayout.setVisibility(View.GONE);
+        mBinding.tvMsg.setVisibility(View.GONE);
 
-        mViewBottomLine = view.findViewById(R.id.view_bottom_line);
-        mViewBottomLine.setVisibility(View.GONE);
+        mBinding.contentLayout.setVisibility(View.GONE);
 
+        mBinding.viewBottomLine.setVisibility(View.GONE);
 
-        mBtnLeft = view.findViewById(R.id.btn_left);
-        mBtnLeft.setOnClickListener(mClickListener);
-        mBtnLeft.setVisibility(View.GONE);
+        mBinding.btnLeft.setOnClickListener(mClickListener);
+        mBinding.btnLeft.setVisibility(View.GONE);
 
-        mBtnCenter = view.findViewById(R.id.btn_center);
-        mBtnCenter.setOnClickListener(mClickListener);
-        mBtnCenter.setVisibility(View.GONE);
+        mBinding.btnCenter.setOnClickListener(mClickListener);
+        mBinding.btnCenter.setVisibility(View.GONE);
 
-        mBtnRight = view.findViewById(R.id.btn_right);
-        mBtnRight.setOnClickListener(mClickListener);
-        mBtnRight.setVisibility(View.GONE);
+        mBinding.btnRight.setOnClickListener(mClickListener);
+        mBinding.btnRight.setVisibility(View.GONE);
 
-        mRootLayout = view.findViewById(R.id.root_layout);
-        mRootLayout.setOnClickListener(mClickListener);
+        mBinding.rootLayout.setOnClickListener(mClickListener);
     }
 
     private View.OnClickListener mClickListener = new View.OnClickListener() {
@@ -133,7 +111,7 @@ public class SystemDialog {
      * @return
      */
     public SystemDialog setTitle(String title) {
-        mTvTitle.setText(title);
+        mBinding.tvTitle.setText(title);
         return this;
     }
 
@@ -143,8 +121,8 @@ public class SystemDialog {
      * @param msg
      */
     public SystemDialog setMsg(String msg) {
-        mTvMsg.setVisibility(View.VISIBLE);
-        mTvMsg.setText(msg);
+        mBinding.tvMsg.setVisibility(View.VISIBLE);
+        mBinding.tvMsg.setText(msg);
         return this;
     }
 
@@ -156,9 +134,9 @@ public class SystemDialog {
      * @return
      */
     public SystemDialog setLeftButton(String left, LeftCallBack leftCallBack) {
-        mViewBottomLine.setVisibility(View.VISIBLE);
-        mBtnLeft.setVisibility(View.VISIBLE);
-        mBtnLeft.setText(left);
+        mBinding.viewBottomLine.setVisibility(View.VISIBLE);
+        mBinding.btnLeft.setVisibility(View.VISIBLE);
+        mBinding.btnLeft.setText(left);
         mLeftCallBack = leftCallBack;
         return this;
     }
@@ -171,8 +149,8 @@ public class SystemDialog {
      * @return
      */
     public SystemDialog setCenterButton(String center, CenterCallBack centerCallBack) {
-        mBtnCenter.setVisibility(View.VISIBLE);
-        mBtnCenter.setText(center);
+        mBinding.btnCenter.setVisibility(View.VISIBLE);
+        mBinding.btnCenter.setText(center);
         mCenterCallBack = centerCallBack;
         return this;
     }
@@ -185,8 +163,8 @@ public class SystemDialog {
      * @return
      */
     public SystemDialog setRightButton(String right, RightCallBack rightCallBack) {
-        mBtnRight.setVisibility(View.VISIBLE);
-        mBtnRight.setText(right);
+        mBinding.btnRight.setVisibility(View.VISIBLE);
+        mBinding.btnRight.setText(right);
         mRightCallBack = rightCallBack;
         return this;
     }
@@ -198,8 +176,8 @@ public class SystemDialog {
      * @return
      */
     public SystemDialog setContentView(View contentView) {
-        mContentLayout.setVisibility(View.VISIBLE);
-        mContentLayout.addView(contentView);
+        mBinding.contentLayout.setVisibility(View.VISIBLE);
+        mBinding.contentLayout.addView(contentView);
         return this;
     }
 
@@ -209,12 +187,12 @@ public class SystemDialog {
     }
 
     public SystemDialog setHideClose() {
-        mBtnClose.setVisibility(View.GONE);
+        mBinding.btnClose.setVisibility(View.GONE);
         return this;
     }
 
     public SystemDialog setHideTitle() {
-        mTvTitle.setVisibility(View.GONE);
+        mBinding.tvTitle.setVisibility(View.GONE);
         return this;
     }
 

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

@@ -78,7 +78,7 @@
                 <TextView
                     android:id="@+id/btn_left"
                     android:layout_width="0dp"
-                    android:layout_height="40dp"
+                    android:layout_height="48dp"
                     android:layout_weight="1"
                     android:foreground="?android:selectableItemBackground"
                     android:gravity="center"
@@ -89,7 +89,7 @@
                 <TextView
                     android:id="@+id/btn_center"
                     android:layout_width="0dp"
-                    android:layout_height="40dp"
+                    android:layout_height="48dp"
                     android:layout_weight="1"
                     android:background="@color/colorBlue"
                     android:foreground="?android:selectableItemBackground"
@@ -101,7 +101,7 @@
                 <TextView
                     android:id="@+id/btn_right"
                     android:layout_width="0dp"
-                    android:layout_height="40dp"
+                    android:layout_height="48dp"
                     android:layout_weight="1"
                     android:background="@color/colorTheme"
                     android:foreground="?android:selectableItemBackground"

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

@@ -17,7 +17,6 @@ import java.util.Map;
 
 
 /**
- *
  * 包名: com.unis.model
  * 类名: AnnounceModel
  * 作用描述:
@@ -72,7 +71,23 @@ public class AnnounceModel {
                         callback.onError(getErrorMsg(response));
                     }
                 });
+    }
+
+    /**
+     *  公告已读
+     * @param id
+     */
+    public void read(String id) {
+        OkGo.<String>post(UrlPath.announce_read + "/" + id).execute(new MyStringCallback() {
+            @Override
+            protected void onSuccessResult(Response<String> response) throws JSONException {
+            }
 
+            @Override
+            public void onError(Response<String> response) {
+                super.onError(response);
+            }
+        });
     }
 
 }

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

@@ -11,6 +11,7 @@ import com.xyxsbj.mylibrary.tool.SPTool;
 import org.json.JSONException;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -249,4 +250,25 @@ public class BasicModel {
         }
         return type;
     }
+
+    /**
+     * 待办类型
+     */
+    Map<String, String> todoTypeMap = new HashMap<String, String>() {{
+        put("code0", "保管员每周粮情检查");
+        put("code1", "安全员每天安全检查");
+        put("code2", "仓储科长每2周本库检查");
+        put("code3", "业务科长每2周分库检查");
+        put("code4", "监管科长每2周租仓、委托点检查");
+        put("code5", "分管副总每月粮情检查");
+        put("code6", "分管副总每月质量检查");
+        put("code7", "分管副总每月分库检查");
+        put("code8", "总经理每季检查粮情");
+        put("code9", "安全员每天租仓管理/委托管理");
+        put("code10", "保管员每天租仓管理/委托管理");
+    }};
+
+    public String getTodoType(String code) {
+        return todoTypeMap.get(code);
+    }
 }

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

@@ -4,6 +4,7 @@ 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.GetRequest;
 import com.unis.model.bean.notice.NoticeBean;
 
 import org.json.JSONArray;
@@ -15,16 +16,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+
 /**
- * 包名: com.unis.model
- * 类名: NoticeModel
- * 作用描述:
+ * 通知请求类
  * 创建人: mQ
- * 创建时间: 2020/12/26 13:45
- * 更新人:
- * 更新时间: 2020/12/26 13:45
- * 更新说明:
- * 版本号: 1.0
+ * 时间: 2020/12/26 13:45
  */
 public class NoticeModel {
     private NoticeModel() {
@@ -104,4 +100,26 @@ public class NoticeModel {
 
     }
 
+    /**
+     * 通知标记已读
+     *
+     * @param id
+     * @param callback
+     */
+    public void read(String id, final DataCallback<String> callback) {
+        GetRequest<String> request = OkGo.get(UrlPath.notice_read + "/" + id);
+        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));
+            }
+        });
+    }
+
 }

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

@@ -115,11 +115,15 @@ public class UrlPath {
     /****************** 通知 ******************/
     // 通知列表
     public static final String notice_list = host + "/api/csc-szls-message/sysNoticeUser/authority/getPage";
+    // 通知已读
+    public static final String notice_read = host + "/api/csc-szls-message/sysNoticeUser/authority_button/readed";
 
 
     /****************** 公告 ******************/
     // 公告列表
     public static final String announce_list = host + "/api/csc-szls-message/sysAnnouncementUser/authority/getPage";
+    // 公告已读
+    public static final String announce_read = host + "/api/csc-szls-message/sysAnnouncementUser/authority_button/readed";
 
 
     /****************** 首页 ******************/
@@ -127,7 +131,4 @@ public class UrlPath {
     public static final String home_percent = host + "/api/csc-szls-system-manage/basicsWarehouse/authority/getPercent";
 
 
-
-
-
 }

version_info.json

@@ -1,6 +1,14 @@
 {
   "info": [
     {
+      "versionName": "1.12",
+      "versionCode": 12,
+      "content": "1.增加公告阅读状态修改\n2.增加通知阅读状态修改",
+      "fileName": "sxzcl_release_1.12_12.apk",
+      "must": true,
+      "time": "2020-12-31"
+    },
+    {
       "versionName": "1.11",
       "versionCode": 11,
       "content": "1.机械通风控制角色关系\n2.优化公告时间显示\n3.优化人员结构增加头像和职位展示\n4.粮情检查控制角色关系\n6.异常退出增加弹出框提示\n7.登录人只能选择自己所管理的仓房\n8.机械通风详情可直接跳转待办\n9.优化未选择库时作业页面弹出框时机\n10.饼图数值由小数改为整数",