diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 084921e..29f73b6 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -103,21 +103,20 @@ SaveKeyValues.putValue("alarmTotal", alarmDataBean.getData().getTotal()); List dataRows = alarmDataBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210626); } - weakReferenceHandler.sendEmptyMessage(20210626); } } }); @@ -172,37 +171,32 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210626) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainAlarmList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainAlarmList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.alarmPositionView, item.getPosition()) - .setText(R.id.alarmTimeView, item.getAlarmTime()) - .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - showSingleCancelDialog(item.getJobId()); - } - }); - } - }; - viewBinding.warningRecyclerView.setAdapter(adapter); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.alarmPositionView, item.getPosition()) + .setText(R.id.alarmTimeView, item.getAlarmTime()) + .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + showSingleCancelDialog(item.getJobId()); + } + }); + } + }; + viewBinding.warningRecyclerView.setAdapter(adapter); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 084921e..29f73b6 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -103,21 +103,20 @@ SaveKeyValues.putValue("alarmTotal", alarmDataBean.getData().getTotal()); List dataRows = alarmDataBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210626); } - weakReferenceHandler.sendEmptyMessage(20210626); } } }); @@ -172,37 +171,32 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210626) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainAlarmList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainAlarmList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.alarmPositionView, item.getPosition()) - .setText(R.id.alarmTimeView, item.getAlarmTime()) - .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - showSingleCancelDialog(item.getJobId()); - } - }); - } - }; - viewBinding.warningRecyclerView.setAdapter(adapter); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.alarmPositionView, item.getPosition()) + .setText(R.id.alarmTimeView, item.getAlarmTime()) + .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + showSingleCancelDialog(item.getJobId()); + } + }); + } + }; + viewBinding.warningRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index d946ba9..0a87678 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -124,21 +124,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210628); } - weakReferenceHandler.sendEmptyMessage(20210628); } } }); @@ -171,69 +170,64 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210628) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) - .setText(R.id.wellNameView, item.getWellName()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.wellPositionView, item.getPosition()) - .setText(R.id.wellStatusView, "已" + item.getBfztName()); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) + .setText(R.id.wellNameView, item.getWellName()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.wellPositionView, item.getPosition()) + .setText(R.id.wellStatusView, "已" + item.getBfztName()); - String bfzt = item.getBfzt(); - if (bfzt.equals("0")) { - viewHolder.setText(R.id.wellOptionButton, "布防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); - } else { - viewHolder.setText(R.id.wellOptionButton, "撤防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + String bfzt = item.getBfzt(); + if (bfzt.equals("0")) { + viewHolder.setText(R.id.wellOptionButton, "布防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); + } else { + viewHolder.setText(R.id.wellOptionButton, "撤防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + } + + viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, "井深" + item.getDeep() + "m"); } + }); - viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, "井深" + item.getDeep() + "m"); + viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + String bfzt = item.getBfzt(); + String bfztName; + if (bfzt.equals("0")) { + bfztName = "布防"; + bfzt = "1"; + } else if (bfzt.equals("1")) { + bfztName = "撤防"; + bfzt = "0"; + } else { + StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); + return; } - }); - - viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - String bfzt = item.getBfzt(); - String bfztName; - if (bfzt.equals("0")) { - bfztName = "布防"; - bfzt = "1"; - } else if (bfzt.equals("1")) { - bfztName = "撤防"; - bfzt = "0"; - } else { - StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); - return; - } - showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); - } - }); - } - }; - viewBinding.wellRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { - String lng = rowsBean.getCoordinateX(); - String lat = rowsBean.getCoordinateY(); - MapHelper.displayOnMap(context, "others", lng, lat); - } - }); - } + showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); + } + }); + } + }; + viewBinding.wellRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { + String lng = rowsBean.getCoordinateX(); + String lat = rowsBean.getCoordinateY(); + MapHelper.displayOnMap(context, "others", lng, lat); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 084921e..29f73b6 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -103,21 +103,20 @@ SaveKeyValues.putValue("alarmTotal", alarmDataBean.getData().getTotal()); List dataRows = alarmDataBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210626); } - weakReferenceHandler.sendEmptyMessage(20210626); } } }); @@ -172,37 +171,32 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210626) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainAlarmList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainAlarmList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.alarmPositionView, item.getPosition()) - .setText(R.id.alarmTimeView, item.getAlarmTime()) - .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - showSingleCancelDialog(item.getJobId()); - } - }); - } - }; - viewBinding.warningRecyclerView.setAdapter(adapter); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.alarmPositionView, item.getPosition()) + .setText(R.id.alarmTimeView, item.getAlarmTime()) + .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + showSingleCancelDialog(item.getJobId()); + } + }); + } + }; + viewBinding.warningRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index d946ba9..0a87678 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -124,21 +124,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210628); } - weakReferenceHandler.sendEmptyMessage(20210628); } } }); @@ -171,69 +170,64 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210628) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) - .setText(R.id.wellNameView, item.getWellName()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.wellPositionView, item.getPosition()) - .setText(R.id.wellStatusView, "已" + item.getBfztName()); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) + .setText(R.id.wellNameView, item.getWellName()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.wellPositionView, item.getPosition()) + .setText(R.id.wellStatusView, "已" + item.getBfztName()); - String bfzt = item.getBfzt(); - if (bfzt.equals("0")) { - viewHolder.setText(R.id.wellOptionButton, "布防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); - } else { - viewHolder.setText(R.id.wellOptionButton, "撤防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + String bfzt = item.getBfzt(); + if (bfzt.equals("0")) { + viewHolder.setText(R.id.wellOptionButton, "布防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); + } else { + viewHolder.setText(R.id.wellOptionButton, "撤防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + } + + viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, "井深" + item.getDeep() + "m"); } + }); - viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, "井深" + item.getDeep() + "m"); + viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + String bfzt = item.getBfzt(); + String bfztName; + if (bfzt.equals("0")) { + bfztName = "布防"; + bfzt = "1"; + } else if (bfzt.equals("1")) { + bfztName = "撤防"; + bfzt = "0"; + } else { + StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); + return; } - }); - - viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - String bfzt = item.getBfzt(); - String bfztName; - if (bfzt.equals("0")) { - bfztName = "布防"; - bfzt = "1"; - } else if (bfzt.equals("1")) { - bfztName = "撤防"; - bfzt = "0"; - } else { - StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); - return; - } - showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); - } - }); - } - }; - viewBinding.wellRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { - String lng = rowsBean.getCoordinateX(); - String lat = rowsBean.getCoordinateY(); - MapHelper.displayOnMap(context, "others", lng, lat); - } - }); - } + showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); + } + }); + } + }; + viewBinding.wellRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { + String lng = rowsBean.getCoordinateX(); + String lat = rowsBean.getCoordinateY(); + MapHelper.displayOnMap(context, "others", lng, lat); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 059fe8b..2edf499 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -70,22 +70,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210601); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210601); } } }); @@ -164,80 +162,75 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210601) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCleanRecordList("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCleanRecordList("", ""); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); - if (item.getPhoto().equals("")) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - ArrayList urls = new ArrayList<>(); - urls.add(StringHelper.appendCompleteURL(item.getPhoto())); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); - } - }); - } - - String lng = item.getLng(); - if (TextUtils.isEmpty(lng)) { - return; - } - String lat = item.getLat(); - if (TextUtils.isEmpty(lat)) { - return; - } - LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); - LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); + if (item.getPhoto().equals("")) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(item.getPhoto())); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { @Override - public void onGetAddress(String address) { - viewHolder.setText(R.id.workerPositionView, address); + public void onClick(View v) { + ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); } }); - viewHolder.setText(R.id.workTimeView, item.getCreateTime()); } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(context, WorkerOnMapActivity.class); - intent.putExtra("userName", rowsBean.getUserName()); - intent.putExtra("createTime", rowsBean.getCreateTime()); - intent.putExtra("toiletName", rowsBean.getToiletName()); - String dataLng = rowsBean.getLng(); - if (TextUtils.isEmpty(dataLng)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = rowsBean.getLat(); - if (TextUtils.isEmpty(dataLat)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + + String lng = item.getLng(); + if (TextUtils.isEmpty(lng)) { + return; } - }); - } + String lat = item.getLat(); + if (TextUtils.isEmpty(lat)) { + return; + } + LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); + LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + @Override + public void onGetAddress(String address) { + viewHolder.setText(R.id.workerPositionView, address); + } + }); + viewHolder.setText(R.id.workTimeView, item.getCreateTime()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(context, WorkerOnMapActivity.class); + intent.putExtra("userName", rowsBean.getUserName()); + intent.putExtra("createTime", rowsBean.getCreateTime()); + intent.putExtra("toiletName", rowsBean.getToiletName()); + String dataLng = rowsBean.getLng(); + if (TextUtils.isEmpty(dataLng)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = rowsBean.getLat(); + if (TextUtils.isEmpty(dataLat)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + } + }); } } return true; diff --git a/.idea/misc.xml b/.idea/misc.xml index 3e77980..4df589c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -99,9 +99,11 @@ + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 084921e..29f73b6 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -103,21 +103,20 @@ SaveKeyValues.putValue("alarmTotal", alarmDataBean.getData().getTotal()); List dataRows = alarmDataBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210626); } - weakReferenceHandler.sendEmptyMessage(20210626); } } }); @@ -172,37 +171,32 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210626) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainAlarmList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainAlarmList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.alarmPositionView, item.getPosition()) - .setText(R.id.alarmTimeView, item.getAlarmTime()) - .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - showSingleCancelDialog(item.getJobId()); - } - }); - } - }; - viewBinding.warningRecyclerView.setAdapter(adapter); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.alarmPositionView, item.getPosition()) + .setText(R.id.alarmTimeView, item.getAlarmTime()) + .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + showSingleCancelDialog(item.getJobId()); + } + }); + } + }; + viewBinding.warningRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index d946ba9..0a87678 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -124,21 +124,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210628); } - weakReferenceHandler.sendEmptyMessage(20210628); } } }); @@ -171,69 +170,64 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210628) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) - .setText(R.id.wellNameView, item.getWellName()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.wellPositionView, item.getPosition()) - .setText(R.id.wellStatusView, "已" + item.getBfztName()); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) + .setText(R.id.wellNameView, item.getWellName()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.wellPositionView, item.getPosition()) + .setText(R.id.wellStatusView, "已" + item.getBfztName()); - String bfzt = item.getBfzt(); - if (bfzt.equals("0")) { - viewHolder.setText(R.id.wellOptionButton, "布防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); - } else { - viewHolder.setText(R.id.wellOptionButton, "撤防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + String bfzt = item.getBfzt(); + if (bfzt.equals("0")) { + viewHolder.setText(R.id.wellOptionButton, "布防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); + } else { + viewHolder.setText(R.id.wellOptionButton, "撤防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + } + + viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, "井深" + item.getDeep() + "m"); } + }); - viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, "井深" + item.getDeep() + "m"); + viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + String bfzt = item.getBfzt(); + String bfztName; + if (bfzt.equals("0")) { + bfztName = "布防"; + bfzt = "1"; + } else if (bfzt.equals("1")) { + bfztName = "撤防"; + bfzt = "0"; + } else { + StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); + return; } - }); - - viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - String bfzt = item.getBfzt(); - String bfztName; - if (bfzt.equals("0")) { - bfztName = "布防"; - bfzt = "1"; - } else if (bfzt.equals("1")) { - bfztName = "撤防"; - bfzt = "0"; - } else { - StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); - return; - } - showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); - } - }); - } - }; - viewBinding.wellRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { - String lng = rowsBean.getCoordinateX(); - String lat = rowsBean.getCoordinateY(); - MapHelper.displayOnMap(context, "others", lng, lat); - } - }); - } + showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); + } + }); + } + }; + viewBinding.wellRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { + String lng = rowsBean.getCoordinateX(); + String lat = rowsBean.getCoordinateY(); + MapHelper.displayOnMap(context, "others", lng, lat); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 059fe8b..2edf499 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -70,22 +70,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210601); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210601); } } }); @@ -164,80 +162,75 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210601) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCleanRecordList("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCleanRecordList("", ""); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); - if (item.getPhoto().equals("")) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - ArrayList urls = new ArrayList<>(); - urls.add(StringHelper.appendCompleteURL(item.getPhoto())); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); - } - }); - } - - String lng = item.getLng(); - if (TextUtils.isEmpty(lng)) { - return; - } - String lat = item.getLat(); - if (TextUtils.isEmpty(lat)) { - return; - } - LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); - LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); + if (item.getPhoto().equals("")) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(item.getPhoto())); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { @Override - public void onGetAddress(String address) { - viewHolder.setText(R.id.workerPositionView, address); + public void onClick(View v) { + ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); } }); - viewHolder.setText(R.id.workTimeView, item.getCreateTime()); } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(context, WorkerOnMapActivity.class); - intent.putExtra("userName", rowsBean.getUserName()); - intent.putExtra("createTime", rowsBean.getCreateTime()); - intent.putExtra("toiletName", rowsBean.getToiletName()); - String dataLng = rowsBean.getLng(); - if (TextUtils.isEmpty(dataLng)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = rowsBean.getLat(); - if (TextUtils.isEmpty(dataLat)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + + String lng = item.getLng(); + if (TextUtils.isEmpty(lng)) { + return; } - }); - } + String lat = item.getLat(); + if (TextUtils.isEmpty(lat)) { + return; + } + LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); + LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + @Override + public void onGetAddress(String address) { + viewHolder.setText(R.id.workerPositionView, address); + } + }); + viewHolder.setText(R.id.workTimeView, item.getCreateTime()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(context, WorkerOnMapActivity.class); + intent.putExtra("userName", rowsBean.getUserName()); + intent.putExtra("createTime", rowsBean.getCreateTime()); + intent.putExtra("toiletName", rowsBean.getToiletName()); + String dataLng = rowsBean.getLng(); + if (TextUtils.isEmpty(dataLng)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = rowsBean.getLat(); + if (TextUtils.isEmpty(dataLat)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 1b88d6f..5739224 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -27,18 +27,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 084921e..29f73b6 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -103,21 +103,20 @@ SaveKeyValues.putValue("alarmTotal", alarmDataBean.getData().getTotal()); List dataRows = alarmDataBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210626); } - weakReferenceHandler.sendEmptyMessage(20210626); } } }); @@ -172,37 +171,32 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210626) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainAlarmList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainAlarmList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.alarmPositionView, item.getPosition()) - .setText(R.id.alarmTimeView, item.getAlarmTime()) - .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - showSingleCancelDialog(item.getJobId()); - } - }); - } - }; - viewBinding.warningRecyclerView.setAdapter(adapter); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.alarmPositionView, item.getPosition()) + .setText(R.id.alarmTimeView, item.getAlarmTime()) + .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + showSingleCancelDialog(item.getJobId()); + } + }); + } + }; + viewBinding.warningRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index d946ba9..0a87678 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -124,21 +124,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210628); } - weakReferenceHandler.sendEmptyMessage(20210628); } } }); @@ -171,69 +170,64 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210628) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) - .setText(R.id.wellNameView, item.getWellName()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.wellPositionView, item.getPosition()) - .setText(R.id.wellStatusView, "已" + item.getBfztName()); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) + .setText(R.id.wellNameView, item.getWellName()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.wellPositionView, item.getPosition()) + .setText(R.id.wellStatusView, "已" + item.getBfztName()); - String bfzt = item.getBfzt(); - if (bfzt.equals("0")) { - viewHolder.setText(R.id.wellOptionButton, "布防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); - } else { - viewHolder.setText(R.id.wellOptionButton, "撤防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + String bfzt = item.getBfzt(); + if (bfzt.equals("0")) { + viewHolder.setText(R.id.wellOptionButton, "布防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); + } else { + viewHolder.setText(R.id.wellOptionButton, "撤防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + } + + viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, "井深" + item.getDeep() + "m"); } + }); - viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, "井深" + item.getDeep() + "m"); + viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + String bfzt = item.getBfzt(); + String bfztName; + if (bfzt.equals("0")) { + bfztName = "布防"; + bfzt = "1"; + } else if (bfzt.equals("1")) { + bfztName = "撤防"; + bfzt = "0"; + } else { + StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); + return; } - }); - - viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - String bfzt = item.getBfzt(); - String bfztName; - if (bfzt.equals("0")) { - bfztName = "布防"; - bfzt = "1"; - } else if (bfzt.equals("1")) { - bfztName = "撤防"; - bfzt = "0"; - } else { - StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); - return; - } - showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); - } - }); - } - }; - viewBinding.wellRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { - String lng = rowsBean.getCoordinateX(); - String lat = rowsBean.getCoordinateY(); - MapHelper.displayOnMap(context, "others", lng, lat); - } - }); - } + showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); + } + }); + } + }; + viewBinding.wellRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { + String lng = rowsBean.getCoordinateX(); + String lat = rowsBean.getCoordinateY(); + MapHelper.displayOnMap(context, "others", lng, lat); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 059fe8b..2edf499 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -70,22 +70,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210601); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210601); } } }); @@ -164,80 +162,75 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210601) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCleanRecordList("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCleanRecordList("", ""); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); - if (item.getPhoto().equals("")) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - ArrayList urls = new ArrayList<>(); - urls.add(StringHelper.appendCompleteURL(item.getPhoto())); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); - } - }); - } - - String lng = item.getLng(); - if (TextUtils.isEmpty(lng)) { - return; - } - String lat = item.getLat(); - if (TextUtils.isEmpty(lat)) { - return; - } - LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); - LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); + if (item.getPhoto().equals("")) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(item.getPhoto())); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { @Override - public void onGetAddress(String address) { - viewHolder.setText(R.id.workerPositionView, address); + public void onClick(View v) { + ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); } }); - viewHolder.setText(R.id.workTimeView, item.getCreateTime()); } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(context, WorkerOnMapActivity.class); - intent.putExtra("userName", rowsBean.getUserName()); - intent.putExtra("createTime", rowsBean.getCreateTime()); - intent.putExtra("toiletName", rowsBean.getToiletName()); - String dataLng = rowsBean.getLng(); - if (TextUtils.isEmpty(dataLng)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = rowsBean.getLat(); - if (TextUtils.isEmpty(dataLat)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + + String lng = item.getLng(); + if (TextUtils.isEmpty(lng)) { + return; } - }); - } + String lat = item.getLat(); + if (TextUtils.isEmpty(lat)) { + return; + } + LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); + LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + @Override + public void onGetAddress(String address) { + viewHolder.setText(R.id.workerPositionView, address); + } + }); + viewHolder.setText(R.id.workTimeView, item.getCreateTime()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(context, WorkerOnMapActivity.class); + intent.putExtra("userName", rowsBean.getUserName()); + intent.putExtra("createTime", rowsBean.getCreateTime()); + intent.putExtra("toiletName", rowsBean.getToiletName()); + String dataLng = rowsBean.getLng(); + if (TextUtils.isEmpty(dataLng)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = rowsBean.getLat(); + if (TextUtils.isEmpty(dataLat)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 1b88d6f..5739224 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -27,18 +27,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 084921e..29f73b6 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -103,21 +103,20 @@ SaveKeyValues.putValue("alarmTotal", alarmDataBean.getData().getTotal()); List dataRows = alarmDataBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210626); } - weakReferenceHandler.sendEmptyMessage(20210626); } } }); @@ -172,37 +171,32 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210626) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainAlarmList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainAlarmList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.alarmPositionView, item.getPosition()) - .setText(R.id.alarmTimeView, item.getAlarmTime()) - .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - showSingleCancelDialog(item.getJobId()); - } - }); - } - }; - viewBinding.warningRecyclerView.setAdapter(adapter); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.alarmPositionView, item.getPosition()) + .setText(R.id.alarmTimeView, item.getAlarmTime()) + .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + showSingleCancelDialog(item.getJobId()); + } + }); + } + }; + viewBinding.warningRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index d946ba9..0a87678 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -124,21 +124,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210628); } - weakReferenceHandler.sendEmptyMessage(20210628); } } }); @@ -171,69 +170,64 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210628) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) - .setText(R.id.wellNameView, item.getWellName()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.wellPositionView, item.getPosition()) - .setText(R.id.wellStatusView, "已" + item.getBfztName()); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) + .setText(R.id.wellNameView, item.getWellName()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.wellPositionView, item.getPosition()) + .setText(R.id.wellStatusView, "已" + item.getBfztName()); - String bfzt = item.getBfzt(); - if (bfzt.equals("0")) { - viewHolder.setText(R.id.wellOptionButton, "布防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); - } else { - viewHolder.setText(R.id.wellOptionButton, "撤防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + String bfzt = item.getBfzt(); + if (bfzt.equals("0")) { + viewHolder.setText(R.id.wellOptionButton, "布防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); + } else { + viewHolder.setText(R.id.wellOptionButton, "撤防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + } + + viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, "井深" + item.getDeep() + "m"); } + }); - viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, "井深" + item.getDeep() + "m"); + viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + String bfzt = item.getBfzt(); + String bfztName; + if (bfzt.equals("0")) { + bfztName = "布防"; + bfzt = "1"; + } else if (bfzt.equals("1")) { + bfztName = "撤防"; + bfzt = "0"; + } else { + StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); + return; } - }); - - viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - String bfzt = item.getBfzt(); - String bfztName; - if (bfzt.equals("0")) { - bfztName = "布防"; - bfzt = "1"; - } else if (bfzt.equals("1")) { - bfztName = "撤防"; - bfzt = "0"; - } else { - StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); - return; - } - showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); - } - }); - } - }; - viewBinding.wellRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { - String lng = rowsBean.getCoordinateX(); - String lat = rowsBean.getCoordinateY(); - MapHelper.displayOnMap(context, "others", lng, lat); - } - }); - } + showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); + } + }); + } + }; + viewBinding.wellRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { + String lng = rowsBean.getCoordinateX(); + String lat = rowsBean.getCoordinateY(); + MapHelper.displayOnMap(context, "others", lng, lat); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 059fe8b..2edf499 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -70,22 +70,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210601); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210601); } } }); @@ -164,80 +162,75 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210601) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCleanRecordList("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCleanRecordList("", ""); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); - if (item.getPhoto().equals("")) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - ArrayList urls = new ArrayList<>(); - urls.add(StringHelper.appendCompleteURL(item.getPhoto())); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); - } - }); - } - - String lng = item.getLng(); - if (TextUtils.isEmpty(lng)) { - return; - } - String lat = item.getLat(); - if (TextUtils.isEmpty(lat)) { - return; - } - LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); - LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); + if (item.getPhoto().equals("")) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(item.getPhoto())); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { @Override - public void onGetAddress(String address) { - viewHolder.setText(R.id.workerPositionView, address); + public void onClick(View v) { + ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); } }); - viewHolder.setText(R.id.workTimeView, item.getCreateTime()); } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(context, WorkerOnMapActivity.class); - intent.putExtra("userName", rowsBean.getUserName()); - intent.putExtra("createTime", rowsBean.getCreateTime()); - intent.putExtra("toiletName", rowsBean.getToiletName()); - String dataLng = rowsBean.getLng(); - if (TextUtils.isEmpty(dataLng)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = rowsBean.getLat(); - if (TextUtils.isEmpty(dataLat)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + + String lng = item.getLng(); + if (TextUtils.isEmpty(lng)) { + return; } - }); - } + String lat = item.getLat(); + if (TextUtils.isEmpty(lat)) { + return; + } + LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); + LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + @Override + public void onGetAddress(String address) { + viewHolder.setText(R.id.workerPositionView, address); + } + }); + viewHolder.setText(R.id.workTimeView, item.getCreateTime()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(context, WorkerOnMapActivity.class); + intent.putExtra("userName", rowsBean.getUserName()); + intent.putExtra("createTime", rowsBean.getCreateTime()); + intent.putExtra("toiletName", rowsBean.getToiletName()); + String dataLng = rowsBean.getLng(); + if (TextUtils.isEmpty(dataLng)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = rowsBean.getLat(); + if (TextUtils.isEmpty(dataLat)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 1b88d6f..5739224 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -27,18 +27,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 084921e..29f73b6 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -103,21 +103,20 @@ SaveKeyValues.putValue("alarmTotal", alarmDataBean.getData().getTotal()); List dataRows = alarmDataBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210626); } - weakReferenceHandler.sendEmptyMessage(20210626); } } }); @@ -172,37 +171,32 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210626) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainAlarmList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainAlarmList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.alarmPositionView, item.getPosition()) - .setText(R.id.alarmTimeView, item.getAlarmTime()) - .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - showSingleCancelDialog(item.getJobId()); - } - }); - } - }; - viewBinding.warningRecyclerView.setAdapter(adapter); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.alarmPositionView, item.getPosition()) + .setText(R.id.alarmTimeView, item.getAlarmTime()) + .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + showSingleCancelDialog(item.getJobId()); + } + }); + } + }; + viewBinding.warningRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index d946ba9..0a87678 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -124,21 +124,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210628); } - weakReferenceHandler.sendEmptyMessage(20210628); } } }); @@ -171,69 +170,64 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210628) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) - .setText(R.id.wellNameView, item.getWellName()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.wellPositionView, item.getPosition()) - .setText(R.id.wellStatusView, "已" + item.getBfztName()); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) + .setText(R.id.wellNameView, item.getWellName()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.wellPositionView, item.getPosition()) + .setText(R.id.wellStatusView, "已" + item.getBfztName()); - String bfzt = item.getBfzt(); - if (bfzt.equals("0")) { - viewHolder.setText(R.id.wellOptionButton, "布防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); - } else { - viewHolder.setText(R.id.wellOptionButton, "撤防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + String bfzt = item.getBfzt(); + if (bfzt.equals("0")) { + viewHolder.setText(R.id.wellOptionButton, "布防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); + } else { + viewHolder.setText(R.id.wellOptionButton, "撤防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + } + + viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, "井深" + item.getDeep() + "m"); } + }); - viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, "井深" + item.getDeep() + "m"); + viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + String bfzt = item.getBfzt(); + String bfztName; + if (bfzt.equals("0")) { + bfztName = "布防"; + bfzt = "1"; + } else if (bfzt.equals("1")) { + bfztName = "撤防"; + bfzt = "0"; + } else { + StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); + return; } - }); - - viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - String bfzt = item.getBfzt(); - String bfztName; - if (bfzt.equals("0")) { - bfztName = "布防"; - bfzt = "1"; - } else if (bfzt.equals("1")) { - bfztName = "撤防"; - bfzt = "0"; - } else { - StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); - return; - } - showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); - } - }); - } - }; - viewBinding.wellRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { - String lng = rowsBean.getCoordinateX(); - String lat = rowsBean.getCoordinateY(); - MapHelper.displayOnMap(context, "others", lng, lat); - } - }); - } + showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); + } + }); + } + }; + viewBinding.wellRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { + String lng = rowsBean.getCoordinateX(); + String lat = rowsBean.getCoordinateY(); + MapHelper.displayOnMap(context, "others", lng, lat); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 059fe8b..2edf499 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -70,22 +70,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210601); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210601); } } }); @@ -164,80 +162,75 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210601) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCleanRecordList("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCleanRecordList("", ""); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); - if (item.getPhoto().equals("")) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - ArrayList urls = new ArrayList<>(); - urls.add(StringHelper.appendCompleteURL(item.getPhoto())); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); - } - }); - } - - String lng = item.getLng(); - if (TextUtils.isEmpty(lng)) { - return; - } - String lat = item.getLat(); - if (TextUtils.isEmpty(lat)) { - return; - } - LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); - LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); + if (item.getPhoto().equals("")) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(item.getPhoto())); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { @Override - public void onGetAddress(String address) { - viewHolder.setText(R.id.workerPositionView, address); + public void onClick(View v) { + ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); } }); - viewHolder.setText(R.id.workTimeView, item.getCreateTime()); } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(context, WorkerOnMapActivity.class); - intent.putExtra("userName", rowsBean.getUserName()); - intent.putExtra("createTime", rowsBean.getCreateTime()); - intent.putExtra("toiletName", rowsBean.getToiletName()); - String dataLng = rowsBean.getLng(); - if (TextUtils.isEmpty(dataLng)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = rowsBean.getLat(); - if (TextUtils.isEmpty(dataLat)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + + String lng = item.getLng(); + if (TextUtils.isEmpty(lng)) { + return; } - }); - } + String lat = item.getLat(); + if (TextUtils.isEmpty(lat)) { + return; + } + LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); + LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + @Override + public void onGetAddress(String address) { + viewHolder.setText(R.id.workerPositionView, address); + } + }); + viewHolder.setText(R.id.workTimeView, item.getCreateTime()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(context, WorkerOnMapActivity.class); + intent.putExtra("userName", rowsBean.getUserName()); + intent.putExtra("createTime", rowsBean.getCreateTime()); + intent.putExtra("toiletName", rowsBean.getToiletName()); + String dataLng = rowsBean.getLng(); + if (TextUtils.isEmpty(dataLng)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = rowsBean.getLat(); + if (TextUtils.isEmpty(dataLat)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 1b88d6f..5739224 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -27,18 +27,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 084921e..29f73b6 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -103,21 +103,20 @@ SaveKeyValues.putValue("alarmTotal", alarmDataBean.getData().getTotal()); List dataRows = alarmDataBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210626); } - weakReferenceHandler.sendEmptyMessage(20210626); } } }); @@ -172,37 +171,32 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210626) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainAlarmList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainAlarmList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.alarmPositionView, item.getPosition()) - .setText(R.id.alarmTimeView, item.getAlarmTime()) - .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - showSingleCancelDialog(item.getJobId()); - } - }); - } - }; - viewBinding.warningRecyclerView.setAdapter(adapter); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.alarmPositionView, item.getPosition()) + .setText(R.id.alarmTimeView, item.getAlarmTime()) + .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + showSingleCancelDialog(item.getJobId()); + } + }); + } + }; + viewBinding.warningRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index d946ba9..0a87678 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -124,21 +124,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210628); } - weakReferenceHandler.sendEmptyMessage(20210628); } } }); @@ -171,69 +170,64 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210628) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) - .setText(R.id.wellNameView, item.getWellName()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.wellPositionView, item.getPosition()) - .setText(R.id.wellStatusView, "已" + item.getBfztName()); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) + .setText(R.id.wellNameView, item.getWellName()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.wellPositionView, item.getPosition()) + .setText(R.id.wellStatusView, "已" + item.getBfztName()); - String bfzt = item.getBfzt(); - if (bfzt.equals("0")) { - viewHolder.setText(R.id.wellOptionButton, "布防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); - } else { - viewHolder.setText(R.id.wellOptionButton, "撤防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + String bfzt = item.getBfzt(); + if (bfzt.equals("0")) { + viewHolder.setText(R.id.wellOptionButton, "布防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); + } else { + viewHolder.setText(R.id.wellOptionButton, "撤防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + } + + viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, "井深" + item.getDeep() + "m"); } + }); - viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, "井深" + item.getDeep() + "m"); + viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + String bfzt = item.getBfzt(); + String bfztName; + if (bfzt.equals("0")) { + bfztName = "布防"; + bfzt = "1"; + } else if (bfzt.equals("1")) { + bfztName = "撤防"; + bfzt = "0"; + } else { + StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); + return; } - }); - - viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - String bfzt = item.getBfzt(); - String bfztName; - if (bfzt.equals("0")) { - bfztName = "布防"; - bfzt = "1"; - } else if (bfzt.equals("1")) { - bfztName = "撤防"; - bfzt = "0"; - } else { - StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); - return; - } - showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); - } - }); - } - }; - viewBinding.wellRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { - String lng = rowsBean.getCoordinateX(); - String lat = rowsBean.getCoordinateY(); - MapHelper.displayOnMap(context, "others", lng, lat); - } - }); - } + showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); + } + }); + } + }; + viewBinding.wellRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { + String lng = rowsBean.getCoordinateX(); + String lat = rowsBean.getCoordinateY(); + MapHelper.displayOnMap(context, "others", lng, lat); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 059fe8b..2edf499 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -70,22 +70,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210601); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210601); } } }); @@ -164,80 +162,75 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210601) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCleanRecordList("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCleanRecordList("", ""); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); - if (item.getPhoto().equals("")) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - ArrayList urls = new ArrayList<>(); - urls.add(StringHelper.appendCompleteURL(item.getPhoto())); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); - } - }); - } - - String lng = item.getLng(); - if (TextUtils.isEmpty(lng)) { - return; - } - String lat = item.getLat(); - if (TextUtils.isEmpty(lat)) { - return; - } - LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); - LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); + if (item.getPhoto().equals("")) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(item.getPhoto())); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { @Override - public void onGetAddress(String address) { - viewHolder.setText(R.id.workerPositionView, address); + public void onClick(View v) { + ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); } }); - viewHolder.setText(R.id.workTimeView, item.getCreateTime()); } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(context, WorkerOnMapActivity.class); - intent.putExtra("userName", rowsBean.getUserName()); - intent.putExtra("createTime", rowsBean.getCreateTime()); - intent.putExtra("toiletName", rowsBean.getToiletName()); - String dataLng = rowsBean.getLng(); - if (TextUtils.isEmpty(dataLng)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = rowsBean.getLat(); - if (TextUtils.isEmpty(dataLat)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + + String lng = item.getLng(); + if (TextUtils.isEmpty(lng)) { + return; } - }); - } + String lat = item.getLat(); + if (TextUtils.isEmpty(lat)) { + return; + } + LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); + LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + @Override + public void onGetAddress(String address) { + viewHolder.setText(R.id.workerPositionView, address); + } + }); + viewHolder.setText(R.id.workTimeView, item.getCreateTime()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(context, WorkerOnMapActivity.class); + intent.putExtra("userName", rowsBean.getUserName()); + intent.putExtra("createTime", rowsBean.getCreateTime()); + intent.putExtra("toiletName", rowsBean.getToiletName()); + String dataLng = rowsBean.getLng(); + if (TextUtils.isEmpty(dataLng)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = rowsBean.getLat(); + if (TextUtils.isEmpty(dataLat)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 1b88d6f..5739224 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -27,18 +27,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 084921e..29f73b6 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -103,21 +103,20 @@ SaveKeyValues.putValue("alarmTotal", alarmDataBean.getData().getTotal()); List dataRows = alarmDataBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210626); } - weakReferenceHandler.sendEmptyMessage(20210626); } } }); @@ -172,37 +171,32 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210626) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainAlarmList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainAlarmList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.alarmPositionView, item.getPosition()) - .setText(R.id.alarmTimeView, item.getAlarmTime()) - .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - showSingleCancelDialog(item.getJobId()); - } - }); - } - }; - viewBinding.warningRecyclerView.setAdapter(adapter); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.alarmPositionView, item.getPosition()) + .setText(R.id.alarmTimeView, item.getAlarmTime()) + .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + showSingleCancelDialog(item.getJobId()); + } + }); + } + }; + viewBinding.warningRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index d946ba9..0a87678 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -124,21 +124,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210628); } - weakReferenceHandler.sendEmptyMessage(20210628); } } }); @@ -171,69 +170,64 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210628) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) - .setText(R.id.wellNameView, item.getWellName()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.wellPositionView, item.getPosition()) - .setText(R.id.wellStatusView, "已" + item.getBfztName()); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) + .setText(R.id.wellNameView, item.getWellName()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.wellPositionView, item.getPosition()) + .setText(R.id.wellStatusView, "已" + item.getBfztName()); - String bfzt = item.getBfzt(); - if (bfzt.equals("0")) { - viewHolder.setText(R.id.wellOptionButton, "布防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); - } else { - viewHolder.setText(R.id.wellOptionButton, "撤防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + String bfzt = item.getBfzt(); + if (bfzt.equals("0")) { + viewHolder.setText(R.id.wellOptionButton, "布防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); + } else { + viewHolder.setText(R.id.wellOptionButton, "撤防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + } + + viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, "井深" + item.getDeep() + "m"); } + }); - viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, "井深" + item.getDeep() + "m"); + viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + String bfzt = item.getBfzt(); + String bfztName; + if (bfzt.equals("0")) { + bfztName = "布防"; + bfzt = "1"; + } else if (bfzt.equals("1")) { + bfztName = "撤防"; + bfzt = "0"; + } else { + StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); + return; } - }); - - viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - String bfzt = item.getBfzt(); - String bfztName; - if (bfzt.equals("0")) { - bfztName = "布防"; - bfzt = "1"; - } else if (bfzt.equals("1")) { - bfztName = "撤防"; - bfzt = "0"; - } else { - StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); - return; - } - showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); - } - }); - } - }; - viewBinding.wellRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { - String lng = rowsBean.getCoordinateX(); - String lat = rowsBean.getCoordinateY(); - MapHelper.displayOnMap(context, "others", lng, lat); - } - }); - } + showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); + } + }); + } + }; + viewBinding.wellRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { + String lng = rowsBean.getCoordinateX(); + String lat = rowsBean.getCoordinateY(); + MapHelper.displayOnMap(context, "others", lng, lat); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 059fe8b..2edf499 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -70,22 +70,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210601); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210601); } } }); @@ -164,80 +162,75 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210601) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCleanRecordList("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCleanRecordList("", ""); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); - if (item.getPhoto().equals("")) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - ArrayList urls = new ArrayList<>(); - urls.add(StringHelper.appendCompleteURL(item.getPhoto())); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); - } - }); - } - - String lng = item.getLng(); - if (TextUtils.isEmpty(lng)) { - return; - } - String lat = item.getLat(); - if (TextUtils.isEmpty(lat)) { - return; - } - LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); - LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); + if (item.getPhoto().equals("")) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(item.getPhoto())); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { @Override - public void onGetAddress(String address) { - viewHolder.setText(R.id.workerPositionView, address); + public void onClick(View v) { + ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); } }); - viewHolder.setText(R.id.workTimeView, item.getCreateTime()); } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(context, WorkerOnMapActivity.class); - intent.putExtra("userName", rowsBean.getUserName()); - intent.putExtra("createTime", rowsBean.getCreateTime()); - intent.putExtra("toiletName", rowsBean.getToiletName()); - String dataLng = rowsBean.getLng(); - if (TextUtils.isEmpty(dataLng)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = rowsBean.getLat(); - if (TextUtils.isEmpty(dataLat)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + + String lng = item.getLng(); + if (TextUtils.isEmpty(lng)) { + return; } - }); - } + String lat = item.getLat(); + if (TextUtils.isEmpty(lat)) { + return; + } + LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); + LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + @Override + public void onGetAddress(String address) { + viewHolder.setText(R.id.workerPositionView, address); + } + }); + viewHolder.setText(R.id.workTimeView, item.getCreateTime()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(context, WorkerOnMapActivity.class); + intent.putExtra("userName", rowsBean.getUserName()); + intent.putExtra("createTime", rowsBean.getCreateTime()); + intent.putExtra("toiletName", rowsBean.getToiletName()); + String dataLng = rowsBean.getLng(); + if (TextUtils.isEmpty(dataLng)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = rowsBean.getLat(); + if (TextUtils.isEmpty(dataLat)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 1b88d6f..5739224 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -27,18 +27,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 084921e..29f73b6 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -103,21 +103,20 @@ SaveKeyValues.putValue("alarmTotal", alarmDataBean.getData().getTotal()); List dataRows = alarmDataBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210626); } - weakReferenceHandler.sendEmptyMessage(20210626); } } }); @@ -172,37 +171,32 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210626) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainAlarmList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainAlarmList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.alarmPositionView, item.getPosition()) - .setText(R.id.alarmTimeView, item.getAlarmTime()) - .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - showSingleCancelDialog(item.getJobId()); - } - }); - } - }; - viewBinding.warningRecyclerView.setAdapter(adapter); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.alarmPositionView, item.getPosition()) + .setText(R.id.alarmTimeView, item.getAlarmTime()) + .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + showSingleCancelDialog(item.getJobId()); + } + }); + } + }; + viewBinding.warningRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index d946ba9..0a87678 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -124,21 +124,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210628); } - weakReferenceHandler.sendEmptyMessage(20210628); } } }); @@ -171,69 +170,64 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210628) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) - .setText(R.id.wellNameView, item.getWellName()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.wellPositionView, item.getPosition()) - .setText(R.id.wellStatusView, "已" + item.getBfztName()); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) + .setText(R.id.wellNameView, item.getWellName()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.wellPositionView, item.getPosition()) + .setText(R.id.wellStatusView, "已" + item.getBfztName()); - String bfzt = item.getBfzt(); - if (bfzt.equals("0")) { - viewHolder.setText(R.id.wellOptionButton, "布防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); - } else { - viewHolder.setText(R.id.wellOptionButton, "撤防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + String bfzt = item.getBfzt(); + if (bfzt.equals("0")) { + viewHolder.setText(R.id.wellOptionButton, "布防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); + } else { + viewHolder.setText(R.id.wellOptionButton, "撤防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + } + + viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, "井深" + item.getDeep() + "m"); } + }); - viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, "井深" + item.getDeep() + "m"); + viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + String bfzt = item.getBfzt(); + String bfztName; + if (bfzt.equals("0")) { + bfztName = "布防"; + bfzt = "1"; + } else if (bfzt.equals("1")) { + bfztName = "撤防"; + bfzt = "0"; + } else { + StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); + return; } - }); - - viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - String bfzt = item.getBfzt(); - String bfztName; - if (bfzt.equals("0")) { - bfztName = "布防"; - bfzt = "1"; - } else if (bfzt.equals("1")) { - bfztName = "撤防"; - bfzt = "0"; - } else { - StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); - return; - } - showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); - } - }); - } - }; - viewBinding.wellRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { - String lng = rowsBean.getCoordinateX(); - String lat = rowsBean.getCoordinateY(); - MapHelper.displayOnMap(context, "others", lng, lat); - } - }); - } + showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); + } + }); + } + }; + viewBinding.wellRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { + String lng = rowsBean.getCoordinateX(); + String lat = rowsBean.getCoordinateY(); + MapHelper.displayOnMap(context, "others", lng, lat); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 059fe8b..2edf499 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -70,22 +70,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210601); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210601); } } }); @@ -164,80 +162,75 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210601) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCleanRecordList("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCleanRecordList("", ""); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); - if (item.getPhoto().equals("")) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - ArrayList urls = new ArrayList<>(); - urls.add(StringHelper.appendCompleteURL(item.getPhoto())); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); - } - }); - } - - String lng = item.getLng(); - if (TextUtils.isEmpty(lng)) { - return; - } - String lat = item.getLat(); - if (TextUtils.isEmpty(lat)) { - return; - } - LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); - LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); + if (item.getPhoto().equals("")) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(item.getPhoto())); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { @Override - public void onGetAddress(String address) { - viewHolder.setText(R.id.workerPositionView, address); + public void onClick(View v) { + ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); } }); - viewHolder.setText(R.id.workTimeView, item.getCreateTime()); } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(context, WorkerOnMapActivity.class); - intent.putExtra("userName", rowsBean.getUserName()); - intent.putExtra("createTime", rowsBean.getCreateTime()); - intent.putExtra("toiletName", rowsBean.getToiletName()); - String dataLng = rowsBean.getLng(); - if (TextUtils.isEmpty(dataLng)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = rowsBean.getLat(); - if (TextUtils.isEmpty(dataLat)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + + String lng = item.getLng(); + if (TextUtils.isEmpty(lng)) { + return; } - }); - } + String lat = item.getLat(); + if (TextUtils.isEmpty(lat)) { + return; + } + LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); + LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + @Override + public void onGetAddress(String address) { + viewHolder.setText(R.id.workerPositionView, address); + } + }); + viewHolder.setText(R.id.workTimeView, item.getCreateTime()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(context, WorkerOnMapActivity.class); + intent.putExtra("userName", rowsBean.getUserName()); + intent.putExtra("createTime", rowsBean.getCreateTime()); + intent.putExtra("toiletName", rowsBean.getToiletName()); + String dataLng = rowsBean.getLng(); + if (TextUtils.isEmpty(dataLng)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = rowsBean.getLat(); + if (TextUtils.isEmpty(dataLat)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 1b88d6f..5739224 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -27,18 +27,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 084921e..29f73b6 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -103,21 +103,20 @@ SaveKeyValues.putValue("alarmTotal", alarmDataBean.getData().getTotal()); List dataRows = alarmDataBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210626); } - weakReferenceHandler.sendEmptyMessage(20210626); } } }); @@ -172,37 +171,32 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210626) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainAlarmList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainAlarmList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.alarmPositionView, item.getPosition()) - .setText(R.id.alarmTimeView, item.getAlarmTime()) - .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - showSingleCancelDialog(item.getJobId()); - } - }); - } - }; - viewBinding.warningRecyclerView.setAdapter(adapter); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.alarmPositionView, item.getPosition()) + .setText(R.id.alarmTimeView, item.getAlarmTime()) + .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + showSingleCancelDialog(item.getJobId()); + } + }); + } + }; + viewBinding.warningRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index d946ba9..0a87678 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -124,21 +124,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210628); } - weakReferenceHandler.sendEmptyMessage(20210628); } } }); @@ -171,69 +170,64 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210628) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) - .setText(R.id.wellNameView, item.getWellName()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.wellPositionView, item.getPosition()) - .setText(R.id.wellStatusView, "已" + item.getBfztName()); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) + .setText(R.id.wellNameView, item.getWellName()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.wellPositionView, item.getPosition()) + .setText(R.id.wellStatusView, "已" + item.getBfztName()); - String bfzt = item.getBfzt(); - if (bfzt.equals("0")) { - viewHolder.setText(R.id.wellOptionButton, "布防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); - } else { - viewHolder.setText(R.id.wellOptionButton, "撤防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + String bfzt = item.getBfzt(); + if (bfzt.equals("0")) { + viewHolder.setText(R.id.wellOptionButton, "布防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); + } else { + viewHolder.setText(R.id.wellOptionButton, "撤防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + } + + viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, "井深" + item.getDeep() + "m"); } + }); - viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, "井深" + item.getDeep() + "m"); + viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + String bfzt = item.getBfzt(); + String bfztName; + if (bfzt.equals("0")) { + bfztName = "布防"; + bfzt = "1"; + } else if (bfzt.equals("1")) { + bfztName = "撤防"; + bfzt = "0"; + } else { + StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); + return; } - }); - - viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - String bfzt = item.getBfzt(); - String bfztName; - if (bfzt.equals("0")) { - bfztName = "布防"; - bfzt = "1"; - } else if (bfzt.equals("1")) { - bfztName = "撤防"; - bfzt = "0"; - } else { - StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); - return; - } - showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); - } - }); - } - }; - viewBinding.wellRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { - String lng = rowsBean.getCoordinateX(); - String lat = rowsBean.getCoordinateY(); - MapHelper.displayOnMap(context, "others", lng, lat); - } - }); - } + showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); + } + }); + } + }; + viewBinding.wellRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { + String lng = rowsBean.getCoordinateX(); + String lat = rowsBean.getCoordinateY(); + MapHelper.displayOnMap(context, "others", lng, lat); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 059fe8b..2edf499 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -70,22 +70,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210601); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210601); } } }); @@ -164,80 +162,75 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210601) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCleanRecordList("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCleanRecordList("", ""); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); - if (item.getPhoto().equals("")) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - ArrayList urls = new ArrayList<>(); - urls.add(StringHelper.appendCompleteURL(item.getPhoto())); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); - } - }); - } - - String lng = item.getLng(); - if (TextUtils.isEmpty(lng)) { - return; - } - String lat = item.getLat(); - if (TextUtils.isEmpty(lat)) { - return; - } - LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); - LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); + if (item.getPhoto().equals("")) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(item.getPhoto())); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { @Override - public void onGetAddress(String address) { - viewHolder.setText(R.id.workerPositionView, address); + public void onClick(View v) { + ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); } }); - viewHolder.setText(R.id.workTimeView, item.getCreateTime()); } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(context, WorkerOnMapActivity.class); - intent.putExtra("userName", rowsBean.getUserName()); - intent.putExtra("createTime", rowsBean.getCreateTime()); - intent.putExtra("toiletName", rowsBean.getToiletName()); - String dataLng = rowsBean.getLng(); - if (TextUtils.isEmpty(dataLng)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = rowsBean.getLat(); - if (TextUtils.isEmpty(dataLat)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + + String lng = item.getLng(); + if (TextUtils.isEmpty(lng)) { + return; } - }); - } + String lat = item.getLat(); + if (TextUtils.isEmpty(lat)) { + return; + } + LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); + LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + @Override + public void onGetAddress(String address) { + viewHolder.setText(R.id.workerPositionView, address); + } + }); + viewHolder.setText(R.id.workTimeView, item.getCreateTime()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(context, WorkerOnMapActivity.class); + intent.putExtra("userName", rowsBean.getUserName()); + intent.putExtra("createTime", rowsBean.getCreateTime()); + intent.putExtra("toiletName", rowsBean.getToiletName()); + String dataLng = rowsBean.getLng(); + if (TextUtils.isEmpty(dataLng)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = rowsBean.getLat(); + if (TextUtils.isEmpty(dataLat)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 1b88d6f..5739224 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -27,18 +27,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 084921e..29f73b6 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -103,21 +103,20 @@ SaveKeyValues.putValue("alarmTotal", alarmDataBean.getData().getTotal()); List dataRows = alarmDataBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210626); } - weakReferenceHandler.sendEmptyMessage(20210626); } } }); @@ -172,37 +171,32 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210626) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainAlarmList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainAlarmList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.alarmPositionView, item.getPosition()) - .setText(R.id.alarmTimeView, item.getAlarmTime()) - .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - showSingleCancelDialog(item.getJobId()); - } - }); - } - }; - viewBinding.warningRecyclerView.setAdapter(adapter); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.alarmPositionView, item.getPosition()) + .setText(R.id.alarmTimeView, item.getAlarmTime()) + .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + showSingleCancelDialog(item.getJobId()); + } + }); + } + }; + viewBinding.warningRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index d946ba9..0a87678 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -124,21 +124,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210628); } - weakReferenceHandler.sendEmptyMessage(20210628); } } }); @@ -171,69 +170,64 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210628) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) - .setText(R.id.wellNameView, item.getWellName()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.wellPositionView, item.getPosition()) - .setText(R.id.wellStatusView, "已" + item.getBfztName()); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) + .setText(R.id.wellNameView, item.getWellName()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.wellPositionView, item.getPosition()) + .setText(R.id.wellStatusView, "已" + item.getBfztName()); - String bfzt = item.getBfzt(); - if (bfzt.equals("0")) { - viewHolder.setText(R.id.wellOptionButton, "布防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); - } else { - viewHolder.setText(R.id.wellOptionButton, "撤防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + String bfzt = item.getBfzt(); + if (bfzt.equals("0")) { + viewHolder.setText(R.id.wellOptionButton, "布防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); + } else { + viewHolder.setText(R.id.wellOptionButton, "撤防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + } + + viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, "井深" + item.getDeep() + "m"); } + }); - viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, "井深" + item.getDeep() + "m"); + viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + String bfzt = item.getBfzt(); + String bfztName; + if (bfzt.equals("0")) { + bfztName = "布防"; + bfzt = "1"; + } else if (bfzt.equals("1")) { + bfztName = "撤防"; + bfzt = "0"; + } else { + StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); + return; } - }); - - viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - String bfzt = item.getBfzt(); - String bfztName; - if (bfzt.equals("0")) { - bfztName = "布防"; - bfzt = "1"; - } else if (bfzt.equals("1")) { - bfztName = "撤防"; - bfzt = "0"; - } else { - StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); - return; - } - showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); - } - }); - } - }; - viewBinding.wellRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { - String lng = rowsBean.getCoordinateX(); - String lat = rowsBean.getCoordinateY(); - MapHelper.displayOnMap(context, "others", lng, lat); - } - }); - } + showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); + } + }); + } + }; + viewBinding.wellRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { + String lng = rowsBean.getCoordinateX(); + String lat = rowsBean.getCoordinateY(); + MapHelper.displayOnMap(context, "others", lng, lat); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 059fe8b..2edf499 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -70,22 +70,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210601); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210601); } } }); @@ -164,80 +162,75 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210601) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCleanRecordList("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCleanRecordList("", ""); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); - if (item.getPhoto().equals("")) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - ArrayList urls = new ArrayList<>(); - urls.add(StringHelper.appendCompleteURL(item.getPhoto())); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); - } - }); - } - - String lng = item.getLng(); - if (TextUtils.isEmpty(lng)) { - return; - } - String lat = item.getLat(); - if (TextUtils.isEmpty(lat)) { - return; - } - LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); - LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); + if (item.getPhoto().equals("")) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(item.getPhoto())); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { @Override - public void onGetAddress(String address) { - viewHolder.setText(R.id.workerPositionView, address); + public void onClick(View v) { + ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); } }); - viewHolder.setText(R.id.workTimeView, item.getCreateTime()); } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(context, WorkerOnMapActivity.class); - intent.putExtra("userName", rowsBean.getUserName()); - intent.putExtra("createTime", rowsBean.getCreateTime()); - intent.putExtra("toiletName", rowsBean.getToiletName()); - String dataLng = rowsBean.getLng(); - if (TextUtils.isEmpty(dataLng)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = rowsBean.getLat(); - if (TextUtils.isEmpty(dataLat)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + + String lng = item.getLng(); + if (TextUtils.isEmpty(lng)) { + return; } - }); - } + String lat = item.getLat(); + if (TextUtils.isEmpty(lat)) { + return; + } + LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); + LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + @Override + public void onGetAddress(String address) { + viewHolder.setText(R.id.workerPositionView, address); + } + }); + viewHolder.setText(R.id.workTimeView, item.getCreateTime()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(context, WorkerOnMapActivity.class); + intent.putExtra("userName", rowsBean.getUserName()); + intent.putExtra("createTime", rowsBean.getCreateTime()); + intent.putExtra("toiletName", rowsBean.getToiletName()); + String dataLng = rowsBean.getLng(); + if (TextUtils.isEmpty(dataLng)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = rowsBean.getLat(); + if (TextUtils.isEmpty(dataLat)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 1b88d6f..5739224 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -27,18 +27,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 084921e..29f73b6 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -103,21 +103,20 @@ SaveKeyValues.putValue("alarmTotal", alarmDataBean.getData().getTotal()); List dataRows = alarmDataBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210626); } - weakReferenceHandler.sendEmptyMessage(20210626); } } }); @@ -172,37 +171,32 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210626) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainAlarmList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainAlarmList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.alarmPositionView, item.getPosition()) - .setText(R.id.alarmTimeView, item.getAlarmTime()) - .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - showSingleCancelDialog(item.getJobId()); - } - }); - } - }; - viewBinding.warningRecyclerView.setAdapter(adapter); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.alarmPositionView, item.getPosition()) + .setText(R.id.alarmTimeView, item.getAlarmTime()) + .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + showSingleCancelDialog(item.getJobId()); + } + }); + } + }; + viewBinding.warningRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index d946ba9..0a87678 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -124,21 +124,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210628); } - weakReferenceHandler.sendEmptyMessage(20210628); } } }); @@ -171,69 +170,64 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210628) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) - .setText(R.id.wellNameView, item.getWellName()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.wellPositionView, item.getPosition()) - .setText(R.id.wellStatusView, "已" + item.getBfztName()); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) + .setText(R.id.wellNameView, item.getWellName()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.wellPositionView, item.getPosition()) + .setText(R.id.wellStatusView, "已" + item.getBfztName()); - String bfzt = item.getBfzt(); - if (bfzt.equals("0")) { - viewHolder.setText(R.id.wellOptionButton, "布防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); - } else { - viewHolder.setText(R.id.wellOptionButton, "撤防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + String bfzt = item.getBfzt(); + if (bfzt.equals("0")) { + viewHolder.setText(R.id.wellOptionButton, "布防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); + } else { + viewHolder.setText(R.id.wellOptionButton, "撤防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + } + + viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, "井深" + item.getDeep() + "m"); } + }); - viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, "井深" + item.getDeep() + "m"); + viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + String bfzt = item.getBfzt(); + String bfztName; + if (bfzt.equals("0")) { + bfztName = "布防"; + bfzt = "1"; + } else if (bfzt.equals("1")) { + bfztName = "撤防"; + bfzt = "0"; + } else { + StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); + return; } - }); - - viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - String bfzt = item.getBfzt(); - String bfztName; - if (bfzt.equals("0")) { - bfztName = "布防"; - bfzt = "1"; - } else if (bfzt.equals("1")) { - bfztName = "撤防"; - bfzt = "0"; - } else { - StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); - return; - } - showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); - } - }); - } - }; - viewBinding.wellRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { - String lng = rowsBean.getCoordinateX(); - String lat = rowsBean.getCoordinateY(); - MapHelper.displayOnMap(context, "others", lng, lat); - } - }); - } + showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); + } + }); + } + }; + viewBinding.wellRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { + String lng = rowsBean.getCoordinateX(); + String lat = rowsBean.getCoordinateY(); + MapHelper.displayOnMap(context, "others", lng, lat); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 059fe8b..2edf499 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -70,22 +70,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210601); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210601); } } }); @@ -164,80 +162,75 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210601) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCleanRecordList("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCleanRecordList("", ""); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); - if (item.getPhoto().equals("")) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - ArrayList urls = new ArrayList<>(); - urls.add(StringHelper.appendCompleteURL(item.getPhoto())); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); - } - }); - } - - String lng = item.getLng(); - if (TextUtils.isEmpty(lng)) { - return; - } - String lat = item.getLat(); - if (TextUtils.isEmpty(lat)) { - return; - } - LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); - LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); + if (item.getPhoto().equals("")) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(item.getPhoto())); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { @Override - public void onGetAddress(String address) { - viewHolder.setText(R.id.workerPositionView, address); + public void onClick(View v) { + ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); } }); - viewHolder.setText(R.id.workTimeView, item.getCreateTime()); } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(context, WorkerOnMapActivity.class); - intent.putExtra("userName", rowsBean.getUserName()); - intent.putExtra("createTime", rowsBean.getCreateTime()); - intent.putExtra("toiletName", rowsBean.getToiletName()); - String dataLng = rowsBean.getLng(); - if (TextUtils.isEmpty(dataLng)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = rowsBean.getLat(); - if (TextUtils.isEmpty(dataLat)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + + String lng = item.getLng(); + if (TextUtils.isEmpty(lng)) { + return; } - }); - } + String lat = item.getLat(); + if (TextUtils.isEmpty(lat)) { + return; + } + LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); + LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + @Override + public void onGetAddress(String address) { + viewHolder.setText(R.id.workerPositionView, address); + } + }); + viewHolder.setText(R.id.workTimeView, item.getCreateTime()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(context, WorkerOnMapActivity.class); + intent.putExtra("userName", rowsBean.getUserName()); + intent.putExtra("createTime", rowsBean.getCreateTime()); + intent.putExtra("toiletName", rowsBean.getToiletName()); + String dataLng = rowsBean.getLng(); + if (TextUtils.isEmpty(dataLng)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = rowsBean.getLat(); + if (TextUtils.isEmpty(dataLat)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 1b88d6f..5739224 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -27,18 +27,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 084921e..29f73b6 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -103,21 +103,20 @@ SaveKeyValues.putValue("alarmTotal", alarmDataBean.getData().getTotal()); List dataRows = alarmDataBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210626); } - weakReferenceHandler.sendEmptyMessage(20210626); } } }); @@ -172,37 +171,32 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210626) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainAlarmList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainAlarmList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.alarmPositionView, item.getPosition()) - .setText(R.id.alarmTimeView, item.getAlarmTime()) - .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - showSingleCancelDialog(item.getJobId()); - } - }); - } - }; - viewBinding.warningRecyclerView.setAdapter(adapter); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.alarmPositionView, item.getPosition()) + .setText(R.id.alarmTimeView, item.getAlarmTime()) + .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + showSingleCancelDialog(item.getJobId()); + } + }); + } + }; + viewBinding.warningRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index d946ba9..0a87678 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -124,21 +124,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210628); } - weakReferenceHandler.sendEmptyMessage(20210628); } } }); @@ -171,69 +170,64 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210628) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) - .setText(R.id.wellNameView, item.getWellName()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.wellPositionView, item.getPosition()) - .setText(R.id.wellStatusView, "已" + item.getBfztName()); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) + .setText(R.id.wellNameView, item.getWellName()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.wellPositionView, item.getPosition()) + .setText(R.id.wellStatusView, "已" + item.getBfztName()); - String bfzt = item.getBfzt(); - if (bfzt.equals("0")) { - viewHolder.setText(R.id.wellOptionButton, "布防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); - } else { - viewHolder.setText(R.id.wellOptionButton, "撤防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + String bfzt = item.getBfzt(); + if (bfzt.equals("0")) { + viewHolder.setText(R.id.wellOptionButton, "布防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); + } else { + viewHolder.setText(R.id.wellOptionButton, "撤防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + } + + viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, "井深" + item.getDeep() + "m"); } + }); - viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, "井深" + item.getDeep() + "m"); + viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + String bfzt = item.getBfzt(); + String bfztName; + if (bfzt.equals("0")) { + bfztName = "布防"; + bfzt = "1"; + } else if (bfzt.equals("1")) { + bfztName = "撤防"; + bfzt = "0"; + } else { + StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); + return; } - }); - - viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - String bfzt = item.getBfzt(); - String bfztName; - if (bfzt.equals("0")) { - bfztName = "布防"; - bfzt = "1"; - } else if (bfzt.equals("1")) { - bfztName = "撤防"; - bfzt = "0"; - } else { - StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); - return; - } - showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); - } - }); - } - }; - viewBinding.wellRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { - String lng = rowsBean.getCoordinateX(); - String lat = rowsBean.getCoordinateY(); - MapHelper.displayOnMap(context, "others", lng, lat); - } - }); - } + showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); + } + }); + } + }; + viewBinding.wellRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { + String lng = rowsBean.getCoordinateX(); + String lat = rowsBean.getCoordinateY(); + MapHelper.displayOnMap(context, "others", lng, lat); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 059fe8b..2edf499 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -70,22 +70,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210601); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210601); } } }); @@ -164,80 +162,75 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210601) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCleanRecordList("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCleanRecordList("", ""); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); - if (item.getPhoto().equals("")) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - ArrayList urls = new ArrayList<>(); - urls.add(StringHelper.appendCompleteURL(item.getPhoto())); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); - } - }); - } - - String lng = item.getLng(); - if (TextUtils.isEmpty(lng)) { - return; - } - String lat = item.getLat(); - if (TextUtils.isEmpty(lat)) { - return; - } - LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); - LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); + if (item.getPhoto().equals("")) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(item.getPhoto())); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { @Override - public void onGetAddress(String address) { - viewHolder.setText(R.id.workerPositionView, address); + public void onClick(View v) { + ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); } }); - viewHolder.setText(R.id.workTimeView, item.getCreateTime()); } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(context, WorkerOnMapActivity.class); - intent.putExtra("userName", rowsBean.getUserName()); - intent.putExtra("createTime", rowsBean.getCreateTime()); - intent.putExtra("toiletName", rowsBean.getToiletName()); - String dataLng = rowsBean.getLng(); - if (TextUtils.isEmpty(dataLng)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = rowsBean.getLat(); - if (TextUtils.isEmpty(dataLat)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + + String lng = item.getLng(); + if (TextUtils.isEmpty(lng)) { + return; } - }); - } + String lat = item.getLat(); + if (TextUtils.isEmpty(lat)) { + return; + } + LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); + LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + @Override + public void onGetAddress(String address) { + viewHolder.setText(R.id.workerPositionView, address); + } + }); + viewHolder.setText(R.id.workTimeView, item.getCreateTime()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(context, WorkerOnMapActivity.class); + intent.putExtra("userName", rowsBean.getUserName()); + intent.putExtra("createTime", rowsBean.getCreateTime()); + intent.putExtra("toiletName", rowsBean.getToiletName()); + String dataLng = rowsBean.getLng(); + if (TextUtils.isEmpty(dataLng)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = rowsBean.getLat(); + if (TextUtils.isEmpty(dataLat)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 1b88d6f..5739224 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -27,18 +27,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + + @@ -114,19 +116,35 @@ + + + + + + + + + + + + + + + + @@ -134,15 +152,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 4fee822..e5a9068 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -25,16 +25,15 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataBeans; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - private final Gson gson; + private final Gson gson = new Gson(); public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; - this.dataBeans = dataRows; + this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); - gson = new Gson(); } @NonNull @@ -45,7 +44,7 @@ @Override public void onBindViewHolder(@NonNull ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { - holder.bindView(dataBeans.get(position)); + holder.bindView(dataRows.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -58,7 +57,19 @@ @Override public int getItemCount() { - return dataBeans.size(); + return dataRows.size(); + } + + @SuppressLint("NotifyDataSetChanged") + public void setRefreshData(List dataRows) { + this.dataRows.clear(); + this.dataRows.addAll(dataRows); + notifyDataSetChanged(); + } + + public void setLoadMoreData(List dataRows) { + this.dataRows.addAll(dataRows); + notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } class ItemViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java index be239b7..7c1a6ce 100644 --- a/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/LightOnListFragment.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; +//TODO 刷新加载待调试，可能有问题 public class LightOnListFragment extends AndroidxBaseFragment { private static final String TAG = "LightOnListFragment"; diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 1817102..0dfdc60 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -30,7 +30,7 @@ private static final String TAG = "NoticePageFragment"; public static WeakReferenceHandler weakReferenceHandler; - private NormalRecyclerAdapter noticeViewAdapter; + private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int pageIndex = 0; // 本地数据库分页从0开始 private boolean isRefresh = false; @@ -62,56 +62,45 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == LocaleConstant.UPDATE_NOTICE_FRAGMENT) { - if (isRefresh || isLoadMore) { - noticeViewAdapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有任何通知", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); - weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { + viewHolder.setText(R.id.dateView, item.getPushDate()) + .setText(R.id.titleView, item.getTitle()) + .setText(R.id.contentView, item.getContent()); + if (item.getIsRead().equals("0")) { + viewHolder.setVisibility(R.id.readStateView, View.GONE); + } else { + viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); } - }); - } else { - viewBinding.emptyView.hide(); - noticeViewAdapter = new NormalRecyclerAdapter(R.layout.item_notice_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, NoticeLocaleBean item) { - viewHolder.setText(R.id.dateView, item.getPushDate()) - .setText(R.id.titleView, item.getTitle()) - .setText(R.id.contentView, item.getContent()); - if (item.getIsRead().equals("0")) { - viewHolder.setVisibility(R.id.readStateView, View.GONE); - } else { - viewHolder.setVisibility(R.id.readStateView, View.VISIBLE); - } - viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { - @Override - public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); - dataBeans.remove(position); - noticeViewAdapter.notifyItemRemoved(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }) - .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { - @Override - public void onClick(View v) { - String caseId = item.getCasePrimaryKey(); - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); - //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); - noticeViewAdapter.notifyItemChanged(position); - noticeViewAdapter.notifyItemRangeChanged(position, dataBeans.size() - position); - } - }); - } - }; - viewBinding.noticeRecyclerView.setAdapter(noticeViewAdapter); - } + viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { + @Override + public void onClick(View v) { + DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + dataBeans.remove(position); + adapter.notifyItemRemoved(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }) + .setOnClickListener(R.id.showDetailLayout, new View.OnClickListener() { + @Override + public void onClick(View v) { + String caseId = item.getCasePrimaryKey(); + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); + //更改数据库里通知状态 + DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + adapter.notifyItemChanged(position); + adapter.notifyItemRangeChanged(position, dataBeans.size() - position); + } + }); + } + }; + viewBinding.noticeRecyclerView.setAdapter(adapter); } } return true; @@ -133,12 +122,12 @@ @Override public void onFinish() { - isRefresh = false; - dataBeans.clear(); pageIndex = 0; - dataBeans = DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex); + adapter.setRefreshData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishRefresh(); + isRefresh = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); @@ -158,12 +147,12 @@ @Override public void onFinish() { - isLoadMore = false; pageIndex++; - dataBeans.addAll( - DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex) - ); + + adapter.setLoadMoreData(DataBaseManager.getInstance().queryNoticeByPage(StringHelper.getUserBean().getId(), pageIndex)); refreshLayout.finishLoadMore(); + isLoadMore = false; + weakReferenceHandler.sendEmptyMessage(LocaleConstant.UPDATE_NOTICE_FRAGMENT); } }.start(); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 3475db6..58187c4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -51,8 +51,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -85,21 +85,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060301); } - weakReferenceHandler.sendEmptyMessage(2021060301); } } }); @@ -109,33 +108,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageHandledDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 4453b0e..4e37ec0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -52,8 +52,8 @@ @Override public void onResume() { - obtainPackageCaseList(); super.onResume(); + obtainPackageCaseList(); } public void obtainPackageCaseList() { @@ -86,21 +86,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021060302); } - weakReferenceHandler.sendEmptyMessage(2021060302); } } }); @@ -110,33 +109,24 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainPackageCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainPackageCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new PackageCaseListAdapter(requireContext(), dataBeans); - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - ContextHub.navigatePageTo( - requireContext(), - PackageTodoDetailActivity.class, - dataBeans.get(position).getId() - ); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new PackageCaseListAdapter(requireContext(), dataBeans); + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickListener(new PackageCaseListAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + ContextHub.navigatePageTo(requireContext(), PackageTodoDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java index ce69314..d6be0e7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckFragment.java @@ -59,21 +59,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104251); } - weakReferenceHandler.sendEmptyMessage(202104251); } } }); @@ -115,44 +114,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java index d0c98ca..c026a26 100644 --- a/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/check/CaseCheckedFragment.java @@ -60,21 +60,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104252); } - weakReferenceHandler.sendEmptyMessage(202104252); } } }); @@ -116,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCheckCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCheckCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { - String fileIdProcess = item.getFileIdProcess(); - if (!TextUtils.isEmpty(fileIdProcess)) { - String[] split = fileIdProcess.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseCheckModel.DataModel.RowsModel item) { + String fileIdProcess = item.getFileIdProcess(); + if (!TextUtils.isEmpty(fileIdProcess)) { + String[] split = fileIdProcess.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseCheckModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CheckedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 3bfb612..560c216 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062107); } - weakReferenceHandler.sendEmptyMessage(2021062107); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AdjustCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAdjustDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index b6a7480..1247bd8 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -55,21 +55,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062106); } - weakReferenceHandler.sendEmptyMessage(2021062106); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDeptStatusCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDeptStatusCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AuthorizeCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), DeptAuthorizeDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index 53333ed..7f555cf 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062105); } - weakReferenceHandler.sendEmptyMessage(2021062105); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, true); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, DelayedCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index e663041..8a19444 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062104); } - weakReferenceHandler.sendEmptyMessage(2021062104); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandledCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 14b28ce..a74f053 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -55,21 +55,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062103); } - weakReferenceHandler.sendEmptyMessage(2021062103); } } }); @@ -107,36 +106,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.obtainDelayedOrPostCaseList(pageIndex, false); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, PostCaseModel.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, rowsBean.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index e6c3812..eec74b9 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -56,21 +56,20 @@ if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(2021062102); } - weakReferenceHandler.sendEmptyMessage(2021062102); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, HandleCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[1]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index d68f2a3..f3d6a43 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210630); } - weakReferenceHandler.sendEmptyMessage(20210630); } } }); @@ -114,47 +113,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainDeptStatusCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainDeptStatusCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, TodoCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); - intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), DeptTodoDetailActivity.class); + intent.putExtra("title", LocaleConstant.DEPT_PAGE_TITLES[0]); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java index f58f9c9..231ad81 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104288); } - weakReferenceHandler.sendEmptyMessage(202104288); } } }); @@ -111,36 +110,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandledBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandledBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java index 31e1453..4a949d0 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104285); } - weakReferenceHandler.sendEmptyMessage(202104285); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104285) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 2fcc7ce..4dcad4a 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104287); } - weakReferenceHandler.sendEmptyMessage(202104287); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "待办案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "待办案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java index c3dcc61..b38231e 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java @@ -58,21 +58,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104286); } - weakReferenceHandler.sendEmptyMessage(202104286); } } }); @@ -117,47 +116,42 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104286) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainHandleCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java index 08fd458..4e2adc6 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104284); } - weakReferenceHandler.sendEmptyMessage(202104284); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java index 035636a..667c05f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/overtime/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104283); } - weakReferenceHandler.sendEmptyMessage(202104283); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainOvertimeCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainOvertimeCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "超时督办"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, OvertimeCaseBean.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, OvertimeCaseBean.DataModel.RowsModel rowsModel) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "超时督办"); + intent.putExtra("id", rowsModel.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java index 85b2747..a652397 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseHandledFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104282); } - weakReferenceHandler.sendEmptyMessage(202104282); } } }); @@ -112,36 +111,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + ContextHub.navigatePageTo(requireContext(), CaseTodoHandledDetailActivity.class, dataBeans.get(position).getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java index ece9725..2d0ea8f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/urgent/CaseTodoFragment.java @@ -56,21 +56,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104281); } - weakReferenceHandler.sendEmptyMessage(202104281); } } }); @@ -112,39 +111,34 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainUrgentCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainUrgentCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); - intent.putExtra("title", "紧急要件"); - intent.putExtra("id", rowsBean.getId()); - startActivity(intent); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, UrgentCaseBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, UrgentCaseBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(requireContext(), CaseTodoDetailActivity.class); + intent.putExtra("title", "紧急要件"); + intent.putExtra("id", rowsBean.getId()); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java index ec7b433..5de8d78 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifiedFragment.java @@ -57,21 +57,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104254); } - weakReferenceHandler.sendEmptyMessage(202104254); } } }); @@ -113,36 +112,31 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); - } - }); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifiedCaseModel.DataModel.RowsModel item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifiedCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifiedDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java index d448de9..deceed4 100644 --- a/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/verify/CaseVerifyFragment.java @@ -59,21 +59,21 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(requireContext(), "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; + } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(202104253); } - weakReferenceHandler.sendEmptyMessage(202104253); } } }); @@ -115,44 +115,39 @@ @Override public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainVerifyCaseList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainVerifyCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, VerifyCaseModel.DataModel.RowsModel item) { + String fileIdVerify = item.getFileIdVerify(); + if (!TextUtils.isEmpty(fileIdVerify)) { + String[] split = fileIdVerify.split(","); + String firstImage = split[0]; + if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { + viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { - ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); - } - }); - } + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, VerifyCaseModel.DataModel.RowsModel rowsModel) { + ContextHub.navigatePageTo(requireContext(), VerifyDetailActivity.class, rowsModel.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 79ec6c0..2202372 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -106,22 +106,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210425); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210425); } } }); @@ -144,46 +142,32 @@ */ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainSearchResult(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { - //核实图片 -// String fileIdVerify = rowsBean.getFileIdVerify(); -// if (!TextUtils.isEmpty(fileIdVerify)) { -// String[] split = fileIdVerify.split(","); -// String firstImage = split[0]; -// if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { -// Glide.with(context).load(StringHelper.appendCompleteURL(firstImage)).into(caseImageView); -// } -// } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { - ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); - } - }); - } + @Override + public void convertView(ViewHolder viewHolder, int position, CaseSearchResultBean.DataDTO.RowsDTO item) { + viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) + .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) + .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); + } + }; + viewBinding.caseRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CaseSearchResultBean.DataDTO.RowsDTO rowsDTO) { + ContextHub.navigatePageTo(context, CaseDetailActivity.class, rowsDTO.getId()); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java index 9aaf4ca..6716650 100644 --- a/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MaintainRecordActivity.java @@ -76,21 +76,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210622); } - weakReferenceHandler.sendEmptyMessage(20210622); } } }); @@ -157,42 +156,37 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210622) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainMaintainRecord("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到相关养护记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainMaintainRecord("", ""); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { + String description = item.getDescription(); + if (TextUtils.isEmpty(description)) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, description); + } + }); } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_maintain_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, MaintainRecordBean.DataBean.RowsBean item) { - String description = item.getDescription(); - if (TextUtils.isEmpty(description)) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, description); - } - }); - } - viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) - .setText(R.id.maintainContentView, item.getContent()) - .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); - } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - } + viewHolder.setText(R.id.bridgeNameView, item.getBridgeName()) + .setText(R.id.maintainContentView, item.getContent()) + .setText(R.id.maintainTimeView, item.getMaintainTimeStr()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java index 084921e..29f73b6 100644 --- a/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/PipelineManagerActivity.java @@ -103,21 +103,20 @@ SaveKeyValues.putValue("alarmTotal", alarmDataBean.getData().getTotal()); List dataRows = alarmDataBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210626); } - weakReferenceHandler.sendEmptyMessage(20210626); } } }); @@ -172,37 +171,32 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210626) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainAlarmList(); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "设备状态很好，没有任何报警", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainAlarmList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.alarmPositionView, item.getPosition()) - .setText(R.id.alarmTimeView, item.getAlarmTime()) - .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - showSingleCancelDialog(item.getJobId()); - } - }); - } - }; - viewBinding.warningRecyclerView.setAdapter(adapter); - } + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_alarm_recycleview, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, AlarmDataBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.alarmMessageView, item.getAlarmMessage()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.alarmPositionView, item.getPosition()) + .setText(R.id.alarmTimeView, item.getAlarmTime()) + .setOnClickListener(R.id.cancelAlarmButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + showSingleCancelDialog(item.getJobId()); + } + }); + } + }; + viewBinding.warningRecyclerView.setAdapter(adapter); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/WellListActivity.java b/app/src/main/java/com/casic/dcms/view/WellListActivity.java index d946ba9..0a87678 100644 --- a/app/src/main/java/com/casic/dcms/view/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/view/WellListActivity.java @@ -124,21 +124,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210628); } - weakReferenceHandler.sendEmptyMessage(20210628); } } }); @@ -171,69 +170,64 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210628) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show("抱歉，无法为您查到窨井数据", null); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) - .setText(R.id.wellNameView, item.getWellName()) - .setText(R.id.wellCodeView, item.getWellCode()) - .setText(R.id.wellPositionView, item.getPosition()) - .setText(R.id.wellStatusView, "已" + item.getBfztName()); + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_well_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, WellListBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.wellTypeView, item.getWellTypeName()) + .setText(R.id.wellNameView, item.getWellName()) + .setText(R.id.wellCodeView, item.getWellCode()) + .setText(R.id.wellPositionView, item.getPosition()) + .setText(R.id.wellStatusView, "已" + item.getBfztName()); - String bfzt = item.getBfzt(); - if (bfzt.equals("0")) { - viewHolder.setText(R.id.wellOptionButton, "布防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); - } else { - viewHolder.setText(R.id.wellOptionButton, "撤防") - .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + String bfzt = item.getBfzt(); + if (bfzt.equals("0")) { + viewHolder.setText(R.id.wellOptionButton, "布防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.onLineColor)); + } else { + viewHolder.setText(R.id.wellOptionButton, "撤防") + .setBackgroundColor(R.id.wellOptionButton, IntHub.convertColor(context, R.color.qmui_config_color_red)); + } + + viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { + @Override + public void onClick(View v) { + StringHub.show(context, "井深" + item.getDeep() + "m"); } + }); - viewHolder.setOnClickListener(R.id.wellNameView, new View.OnClickListener() { - @Override - public void onClick(View v) { - StringHub.show(context, "井深" + item.getDeep() + "m"); + viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { + @Override + public void onClick(View v) { + String bfzt = item.getBfzt(); + String bfztName; + if (bfzt.equals("0")) { + bfztName = "布防"; + bfzt = "1"; + } else if (bfzt.equals("1")) { + bfztName = "撤防"; + bfzt = "0"; + } else { + StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); + return; } - }); - - viewHolder.setOnClickListener(R.id.wellOptionButton, new View.OnClickListener() { - @Override - public void onClick(View v) { - String bfzt = item.getBfzt(); - String bfztName; - if (bfzt.equals("0")) { - bfztName = "布防"; - bfzt = "1"; - } else if (bfzt.equals("1")) { - bfztName = "撤防"; - bfzt = "0"; - } else { - StringHub.show(context, "窨井状态错误，无法进行撤防或者布防"); - return; - } - showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); - } - }); - } - }; - viewBinding.wellRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { - String lng = rowsBean.getCoordinateX(); - String lat = rowsBean.getCoordinateY(); - MapHelper.displayOnMap(context, "others", lng, lat); - } - }); - } + showSingleOptionDialog(bfztName, dataBeans.get(position).getId(), bfzt); + } + }); + } + }; + viewBinding.wellRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, WellListBean.DataBean.RowsBean rowsBean) { + String lng = rowsBean.getCoordinateX(); + String lat = rowsBean.getCoordinateY(); + MapHelper.displayOnMap(context, "others", lng, lat); + } + }); } } return true; diff --git a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java index 059fe8b..2edf499 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/CleaningRecordsActivity.java @@ -70,22 +70,20 @@ if (resultBean.getCode() == 200) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { - dataBeans.clear(); //下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; + adapter.setRefreshData(dataRows); viewBinding.refreshLayout.finishRefresh(); isRefresh = false; } else if (isLoadMore) { if (dataRows.size() == 0) { StringHub.show(context, "到底了，别拉了"); } - dataBeans.addAll(dataRows); + adapter.setLoadMoreData(dataRows); viewBinding.refreshLayout.finishLoadMore(); isLoadMore = false; } else { dataBeans = dataRows; + weakReferenceHandler.sendEmptyMessage(20210601); } - //更新RecyclerView - weakReferenceHandler.sendEmptyMessage(20210601); } } }); @@ -164,80 +162,75 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210601) { - if (isRefresh || isLoadMore) { - adapter.notifyDataSetChanged(); + if (dataBeans.size() == 0) { + viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { + @Override + public void onClick(View v) { + pageIndex = 1; + obtainCleanRecordList("", ""); + } + }); } else { - //首次加载数据 - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉，没有查到您的保洁工作记录", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainCleanRecordList("", ""); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { - viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); - if (item.getPhoto().equals("")) { - viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); - } else { - viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); - ArrayList urls = new ArrayList<>(); - urls.add(StringHelper.appendCompleteURL(item.getPhoto())); - viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { - @Override - public void onClick(View v) { - ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); - } - }); - } - - String lng = item.getLng(); - if (TextUtils.isEmpty(lng)) { - return; - } - String lat = item.getLat(); - if (TextUtils.isEmpty(lat)) { - return; - } - LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); - LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + viewBinding.emptyView.hide(); + adapter = new NormalRecyclerAdapter(R.layout.item_record_rv_l, dataBeans) { + @Override + public void convertView(ViewHolder viewHolder, int position, CleanRecordBean.DataBean.RowsBean item) { + viewHolder.setText(R.id.toiletNameView, item.getToiletName().equals("") ? "未知" : item.getToiletName()); + if (item.getPhoto().equals("")) { + viewHolder.setVisibility(R.id.descriptionImageView, View.GONE); + } else { + viewHolder.setVisibility(R.id.descriptionImageView, View.VISIBLE); + ArrayList urls = new ArrayList<>(); + urls.add(StringHelper.appendCompleteURL(item.getPhoto())); + viewHolder.setOnClickListener(R.id.descriptionImageView, new View.OnClickListener() { @Override - public void onGetAddress(String address) { - viewHolder.setText(R.id.workerPositionView, address); + public void onClick(View v) { + ContextHub.navigatePageTo(context, BigImageActivity.class, 0, urls); } }); - viewHolder.setText(R.id.workTimeView, item.getCreateTime()); } - }; - viewBinding.recordRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { - Intent intent = new Intent(context, WorkerOnMapActivity.class); - intent.putExtra("userName", rowsBean.getUserName()); - intent.putExtra("createTime", rowsBean.getCreateTime()); - intent.putExtra("toiletName", rowsBean.getToiletName()); - String dataLng = rowsBean.getLng(); - if (TextUtils.isEmpty(dataLng)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lng", Double.parseDouble(dataLng)); - String dataLat = rowsBean.getLat(); - if (TextUtils.isEmpty(dataLat)) { - StringHub.show(context, "经度异常"); - return; - } - intent.putExtra("lat", Double.parseDouble(dataLat)); - startActivity(intent); + + String lng = item.getLng(); + if (TextUtils.isEmpty(lng)) { + return; } - }); - } + String lat = item.getLat(); + if (TextUtils.isEmpty(lat)) { + return; + } + LatLonPoint latLonPoint = new LatLonPoint(Double.parseDouble(lat), Double.parseDouble(lng)); + LocationHelper.antiCodingLocation(context, latLonPoint, new IAddressListener() { + @Override + public void onGetAddress(String address) { + viewHolder.setText(R.id.workerPositionView, address); + } + }); + viewHolder.setText(R.id.workTimeView, item.getCreateTime()); + } + }; + viewBinding.recordRecyclerView.setAdapter(adapter); + adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { + @Override + public void onItemClicked(int position, CleanRecordBean.DataBean.RowsBean rowsBean) { + Intent intent = new Intent(context, WorkerOnMapActivity.class); + intent.putExtra("userName", rowsBean.getUserName()); + intent.putExtra("createTime", rowsBean.getCreateTime()); + intent.putExtra("toiletName", rowsBean.getToiletName()); + String dataLng = rowsBean.getLng(); + if (TextUtils.isEmpty(dataLng)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lng", Double.parseDouble(dataLng)); + String dataLat = rowsBean.getLat(); + if (TextUtils.isEmpty(dataLat)) { + StringHub.show(context, "经度异常"); + return; + } + intent.putExtra("lat", Double.parseDouble(dataLat)); + startActivity(intent); + } + }); } } return true; diff --git a/app/src/main/res/layout/activity_case_list.xml b/app/src/main/res/layout/activity_case_list.xml index 1b88d6f..5739224 100644 --- a/app/src/main/res/layout/activity_case_list.xml +++ b/app/src/main/res/layout/activity_case_list.xml @@ -27,18 +27,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - - - - + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />