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 fdee789..659369f 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { 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 fdee789..659369f 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { 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 b5d807e..98a241d 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { 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 fdee789..659369f 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { 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 b5d807e..98a241d 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { 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 52c88fd..f2ff800 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { 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 fdee789..659369f 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { 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 b5d807e..98a241d 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { 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 52c88fd..f2ff800 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { 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 2ce5297..78f82af 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 @@ -140,7 +140,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { 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 fdee789..659369f 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { 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 b5d807e..98a241d 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { 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 52c88fd..f2ff800 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { 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 2ce5297..78f82af 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 @@ -140,7 +140,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { 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 d8b3396..0b6c73e 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { 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 fdee789..659369f 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { 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 b5d807e..98a241d 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { 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 52c88fd..f2ff800 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { 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 2ce5297..78f82af 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 @@ -140,7 +140,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { 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 d8b3396..0b6c73e 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { 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 2c5f4d7..4130326 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 @@ -131,7 +131,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { 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 fdee789..659369f 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { 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 b5d807e..98a241d 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { 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 52c88fd..f2ff800 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { 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 2ce5297..78f82af 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 @@ -140,7 +140,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { 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 d8b3396..0b6c73e 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { 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 2c5f4d7..4130326 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 @@ -131,7 +131,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { 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 febcb54..3dedb3b 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 @@ -5,7 +5,6 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -37,7 +36,7 @@ private DeptCaseViewModel handleViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -77,17 +76,11 @@ } } }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; getDeptStatusCaseList(); } private void getDeptStatusCaseList() { - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); + handleViewModel.getDeptStatusCaseList(requireContext(), page, "todo"); } @Override @@ -97,7 +90,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } }); @@ -105,7 +98,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getDeptStatusCaseList(); } }); @@ -116,13 +109,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getDeptStatusCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { @@ -141,7 +128,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { 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 fdee789..659369f 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { 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 b5d807e..98a241d 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { 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 52c88fd..f2ff800 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { 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 2ce5297..78f82af 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 @@ -140,7 +140,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { 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 d8b3396..0b6c73e 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { 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 2c5f4d7..4130326 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 @@ -131,7 +131,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { 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 febcb54..3dedb3b 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 @@ -5,7 +5,6 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -37,7 +36,7 @@ private DeptCaseViewModel handleViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -77,17 +76,11 @@ } } }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; getDeptStatusCaseList(); } private void getDeptStatusCaseList() { - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); + handleViewModel.getDeptStatusCaseList(requireContext(), page, "todo"); } @Override @@ -97,7 +90,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } }); @@ -105,7 +98,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getDeptStatusCaseList(); } }); @@ -116,13 +109,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getDeptStatusCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { @@ -141,7 +128,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index f590269..5d6d3f1 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.ViewGroupHub; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.widget.TitleBarView; import java.util.ArrayList; import java.util.List; @@ -29,9 +30,17 @@ @Override protected void setupTopBarLayout() { ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { + @Override + public void onLeftClick() { + finish(); + } - binding.titleBarLayout.titleView.setText("部门处置"); - binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + @Override + public void onRightClick() { + + } + }); } @Override 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 fdee789..659369f 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { 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 b5d807e..98a241d 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { 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 52c88fd..f2ff800 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { 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 2ce5297..78f82af 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 @@ -140,7 +140,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { 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 d8b3396..0b6c73e 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { 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 2c5f4d7..4130326 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 @@ -131,7 +131,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { 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 febcb54..3dedb3b 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 @@ -5,7 +5,6 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -37,7 +36,7 @@ private DeptCaseViewModel handleViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -77,17 +76,11 @@ } } }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; getDeptStatusCaseList(); } private void getDeptStatusCaseList() { - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); + handleViewModel.getDeptStatusCaseList(requireContext(), page, "todo"); } @Override @@ -97,7 +90,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } }); @@ -105,7 +98,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getDeptStatusCaseList(); } }); @@ -116,13 +109,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getDeptStatusCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { @@ -141,7 +128,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index f590269..5d6d3f1 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.ViewGroupHub; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.widget.TitleBarView; import java.util.ArrayList; import java.util.List; @@ -29,9 +30,17 @@ @Override protected void setupTopBarLayout() { ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { + @Override + public void onLeftClick() { + finish(); + } - binding.titleBarLayout.titleView.setText("部门处置"); - binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + @Override + public void onRightClick() { + + } + }); } @Override diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml index b07c7d1..7df29be 100644 --- a/app/src/main/res/layout/activity_dept_handle.xml +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -6,9 +6,16 @@ android:layout_height="match_parent" android:orientation="vertical"> - + 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 fdee789..659369f 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AdjustCaseModel.DataBean.RowsBean rowsBean) { 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 b5d807e..98a241d 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, AuthorizeCaseModel.DataBean.RowsBean rowsBean) { 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 52c88fd..f2ff800 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, DelayedCaseModel.DataBean.RowsBean rowsBean) { 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 2ce5297..78f82af 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 @@ -140,7 +140,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, HandledCaseModel.DataModel.RowsModel rowsModel) { 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 d8b3396..0b6c73e 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 @@ -126,7 +126,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, PostCaseModel.DataBean.RowsBean rowsBean) { 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 2c5f4d7..4130326 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 @@ -131,7 +131,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, HandleCaseModel.DataModel.RowsModel rowsModel) { 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 febcb54..3dedb3b 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 @@ -5,7 +5,6 @@ import android.os.Handler; import android.os.Message; import android.text.TextUtils; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -37,7 +36,7 @@ private DeptCaseViewModel handleViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -77,17 +76,11 @@ } } }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; getDeptStatusCaseList(); } private void getDeptStatusCaseList() { - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "todo"); + handleViewModel.getDeptStatusCaseList(requireContext(), page, "todo"); } @Override @@ -97,7 +90,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } }); @@ -105,7 +98,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getDeptStatusCaseList(); } }); @@ -116,13 +109,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 20210630) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getDeptStatusCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { @@ -141,7 +128,7 @@ .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); } }; - getBinding().caseRecyclerView.setAdapter(adapter); + getBinding().recyclerView.setAdapter(adapter); adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { @Override public void onItemClicked(int position, TodoCaseModel.DataModel.RowsModel rowsModel) { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java index f590269..5d6d3f1 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptHandleActivity.java @@ -20,6 +20,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.ViewGroupHub; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.widget.TitleBarView; import java.util.ArrayList; import java.util.List; @@ -29,9 +30,17 @@ @Override protected void setupTopBarLayout() { ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { + @Override + public void onLeftClick() { + finish(); + } - binding.titleBarLayout.titleView.setText("部门处置"); - binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + @Override + public void onRightClick() { + + } + }); } @Override diff --git a/app/src/main/res/layout/activity_dept_handle.xml b/app/src/main/res/layout/activity_dept_handle.xml index b07c7d1..7df29be 100644 --- a/app/src/main/res/layout/activity_dept_handle.xml +++ b/app/src/main/res/layout/activity_dept_handle.xml @@ -6,9 +6,16 @@ android:layout_height="match_parent" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/fragment_dept_case.xml b/app/src/main/res/layout/fragment_dept_case.xml index 5a71b63..9fdc2cd 100644 --- a/app/src/main/res/layout/fragment_dept_case.xml +++ b/app/src/main/res/layout/fragment_dept_case.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" />