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 62db8ed..3a2e094 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 62db8ed..3a2e094 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 27f60a2..7a5f2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 62db8ed..3a2e094 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 27f60a2..7a5f2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 d8d825f..d80f052 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -34,7 +33,7 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); @@ -80,12 +79,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandledCaseList(requireContext(), pageIndex); + caseViewModel.getHandledCaseList(requireContext(), page); } @Override @@ -94,7 +93,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -102,7 +101,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -113,13 +112,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 62db8ed..3a2e094 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 27f60a2..7a5f2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 d8d825f..d80f052 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -34,7 +33,7 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); @@ -80,12 +79,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandledCaseList(requireContext(), pageIndex); + caseViewModel.getHandledCaseList(requireContext(), page); } @Override @@ -94,7 +93,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -102,7 +101,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -113,13 +112,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 26d0942..0a8b642 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 @@ -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 CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -82,12 +81,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); + caseViewModel.getHandleCaseList(requireContext(), page, false); } @Override @@ -96,7 +95,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -104,7 +103,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -115,13 +114,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 62db8ed..3a2e094 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 27f60a2..7a5f2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 d8d825f..d80f052 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -34,7 +33,7 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); @@ -80,12 +79,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandledCaseList(requireContext(), pageIndex); + caseViewModel.getHandledCaseList(requireContext(), page); } @Override @@ -94,7 +93,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -102,7 +101,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -113,13 +112,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 26d0942..0a8b642 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 @@ -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 CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -82,12 +81,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); + caseViewModel.getHandleCaseList(requireContext(), page, false); } @Override @@ -96,7 +95,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -104,7 +103,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -115,13 +114,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 3424ebd..8067ff0 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 62db8ed..3a2e094 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 27f60a2..7a5f2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 d8d825f..d80f052 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -34,7 +33,7 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); @@ -80,12 +79,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandledCaseList(requireContext(), pageIndex); + caseViewModel.getHandledCaseList(requireContext(), page); } @Override @@ -94,7 +93,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -102,7 +101,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -113,13 +112,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 26d0942..0a8b642 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 @@ -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 CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -82,12 +81,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); + caseViewModel.getHandleCaseList(requireContext(), page, false); } @Override @@ -96,7 +95,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -104,7 +103,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -115,13 +114,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 3424ebd..8067ff0 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 1c2c20d..f9d7b09 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 @@ -4,7 +4,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 62db8ed..3a2e094 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 27f60a2..7a5f2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 d8d825f..d80f052 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -34,7 +33,7 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); @@ -80,12 +79,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandledCaseList(requireContext(), pageIndex); + caseViewModel.getHandledCaseList(requireContext(), page); } @Override @@ -94,7 +93,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -102,7 +101,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -113,13 +112,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 26d0942..0a8b642 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 @@ -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 CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -82,12 +81,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); + caseViewModel.getHandleCaseList(requireContext(), page, false); } @Override @@ -96,7 +95,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -104,7 +103,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -115,13 +114,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 3424ebd..8067ff0 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 1c2c20d..f9d7b09 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 @@ -4,7 +4,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 2cc0a02..ca639b5 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private NormalRecyclerAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getUrgentCaseList(); } private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getUrgentCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getUrgentCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getUrgentCaseList(); - } - }); + getBinding().emptyView.show(null, "没有紧急案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 62db8ed..3a2e094 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 27f60a2..7a5f2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 d8d825f..d80f052 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -34,7 +33,7 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); @@ -80,12 +79,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandledCaseList(requireContext(), pageIndex); + caseViewModel.getHandledCaseList(requireContext(), page); } @Override @@ -94,7 +93,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -102,7 +101,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -113,13 +112,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 26d0942..0a8b642 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 @@ -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 CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -82,12 +81,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); + caseViewModel.getHandleCaseList(requireContext(), page, false); } @Override @@ -96,7 +95,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -104,7 +103,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -115,13 +114,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 3424ebd..8067ff0 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 1c2c20d..f9d7b09 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 @@ -4,7 +4,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 2cc0a02..ca639b5 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private NormalRecyclerAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getUrgentCaseList(); } private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getUrgentCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getUrgentCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getUrgentCaseList(); - } - }); + getBinding().emptyView.show(null, "没有紧急案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 54b773e..9fecefd 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 @@ -4,7 +4,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getUrgentCaseList(); } private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getUrgentCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getUrgentCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getUrgentCaseList(); - } - }); + getBinding().emptyView.show(null, "没有紧急案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 62db8ed..3a2e094 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 27f60a2..7a5f2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 d8d825f..d80f052 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -34,7 +33,7 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); @@ -80,12 +79,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandledCaseList(requireContext(), pageIndex); + caseViewModel.getHandledCaseList(requireContext(), page); } @Override @@ -94,7 +93,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -102,7 +101,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -113,13 +112,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 26d0942..0a8b642 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 @@ -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 CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -82,12 +81,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); + caseViewModel.getHandleCaseList(requireContext(), page, false); } @Override @@ -96,7 +95,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -104,7 +103,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -115,13 +114,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 3424ebd..8067ff0 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 1c2c20d..f9d7b09 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 @@ -4,7 +4,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 2cc0a02..ca639b5 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private NormalRecyclerAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getUrgentCaseList(); } private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getUrgentCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getUrgentCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getUrgentCaseList(); - } - }); + getBinding().emptyView.show(null, "没有紧急案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 54b773e..9fecefd 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 @@ -4,7 +4,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getUrgentCaseList(); } private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getUrgentCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getUrgentCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getUrgentCaseList(); - } - }); + getBinding().emptyView.show(null, "没有紧急案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 426878b..75ae9dc 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private NormalRecyclerAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getVerifyCaseList(); } public void getVerifyCaseList() { - caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getVerifyCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getVerifyCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getVerifyCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 62db8ed..3a2e094 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 27f60a2..7a5f2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 d8d825f..d80f052 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -34,7 +33,7 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); @@ -80,12 +79,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandledCaseList(requireContext(), pageIndex); + caseViewModel.getHandledCaseList(requireContext(), page); } @Override @@ -94,7 +93,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -102,7 +101,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -113,13 +112,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 26d0942..0a8b642 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 @@ -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 CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -82,12 +81,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); + caseViewModel.getHandleCaseList(requireContext(), page, false); } @Override @@ -96,7 +95,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -104,7 +103,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -115,13 +114,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 3424ebd..8067ff0 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 1c2c20d..f9d7b09 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 @@ -4,7 +4,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 2cc0a02..ca639b5 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private NormalRecyclerAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getUrgentCaseList(); } private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getUrgentCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getUrgentCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getUrgentCaseList(); - } - }); + getBinding().emptyView.show(null, "没有紧急案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 54b773e..9fecefd 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 @@ -4,7 +4,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getUrgentCaseList(); } private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getUrgentCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getUrgentCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getUrgentCaseList(); - } - }); + getBinding().emptyView.show(null, "没有紧急案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 426878b..75ae9dc 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private NormalRecyclerAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getVerifyCaseList(); } public void getVerifyCaseList() { - caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getVerifyCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getVerifyCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getVerifyCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 d5a91fc..0cba2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private NormalRecyclerAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getVerifyCaseList(); } public void getVerifyCaseList() { - caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getVerifyCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getVerifyCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getVerifyCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 62db8ed..3a2e094 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 27f60a2..7a5f2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 d8d825f..d80f052 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -34,7 +33,7 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); @@ -80,12 +79,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandledCaseList(requireContext(), pageIndex); + caseViewModel.getHandledCaseList(requireContext(), page); } @Override @@ -94,7 +93,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -102,7 +101,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -113,13 +112,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 26d0942..0a8b642 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 @@ -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 CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -82,12 +81,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); + caseViewModel.getHandleCaseList(requireContext(), page, false); } @Override @@ -96,7 +95,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -104,7 +103,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -115,13 +114,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 3424ebd..8067ff0 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 1c2c20d..f9d7b09 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 @@ -4,7 +4,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 2cc0a02..ca639b5 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private NormalRecyclerAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getUrgentCaseList(); } private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getUrgentCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getUrgentCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getUrgentCaseList(); - } - }); + getBinding().emptyView.show(null, "没有紧急案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 54b773e..9fecefd 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 @@ -4,7 +4,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getUrgentCaseList(); } private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getUrgentCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getUrgentCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getUrgentCaseList(); - } - }); + getBinding().emptyView.show(null, "没有紧急案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 426878b..75ae9dc 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private NormalRecyclerAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getVerifyCaseList(); } public void getVerifyCaseList() { - caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getVerifyCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getVerifyCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getVerifyCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 d5a91fc..0cba2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private NormalRecyclerAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getVerifyCaseList(); } public void getVerifyCaseList() { - caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getVerifyCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getVerifyCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getVerifyCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { diff --git a/app/src/main/java/com/casic/dcms/greendao/DaoMaster.java b/app/src/main/java/com/casic/dcms/greendao/DaoMaster.java index 8baae67..5f22281 100644 --- a/app/src/main/java/com/casic/dcms/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/dcms/greendao/DaoMaster.java @@ -13,7 +13,6 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 1): knows all DAOs. */ @@ -29,9 +28,7 @@ ToiletListBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { MapConfigBeanDao.dropTable(db, ifExists); NoticeLocaleBeanDao.dropTable(db, ifExists); @@ -86,9 +83,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); 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 62db8ed..3a2e094 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 27f60a2..7a5f2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 d8d825f..d80f052 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -34,7 +33,7 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); @@ -80,12 +79,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandledCaseList(requireContext(), pageIndex); + caseViewModel.getHandledCaseList(requireContext(), page); } @Override @@ -94,7 +93,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -102,7 +101,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -113,13 +112,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 26d0942..0a8b642 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 @@ -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 CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -82,12 +81,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); + caseViewModel.getHandleCaseList(requireContext(), page, false); } @Override @@ -96,7 +95,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -104,7 +103,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -115,13 +114,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 3424ebd..8067ff0 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 1c2c20d..f9d7b09 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 @@ -4,7 +4,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 2cc0a02..ca639b5 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private NormalRecyclerAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getUrgentCaseList(); } private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getUrgentCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getUrgentCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getUrgentCaseList(); - } - }); + getBinding().emptyView.show(null, "没有紧急案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 54b773e..9fecefd 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 @@ -4,7 +4,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getUrgentCaseList(); } private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getUrgentCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getUrgentCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getUrgentCaseList(); - } - }); + getBinding().emptyView.show(null, "没有紧急案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 426878b..75ae9dc 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private NormalRecyclerAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getVerifyCaseList(); } public void getVerifyCaseList() { - caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getVerifyCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getVerifyCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getVerifyCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 d5a91fc..0cba2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private NormalRecyclerAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getVerifyCaseList(); } public void getVerifyCaseList() { - caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getVerifyCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getVerifyCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getVerifyCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { diff --git a/app/src/main/java/com/casic/dcms/greendao/DaoMaster.java b/app/src/main/java/com/casic/dcms/greendao/DaoMaster.java index 8baae67..5f22281 100644 --- a/app/src/main/java/com/casic/dcms/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/dcms/greendao/DaoMaster.java @@ -13,7 +13,6 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 1): knows all DAOs. */ @@ -29,9 +28,7 @@ ToiletListBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { MapConfigBeanDao.dropTable(db, ifExists); NoticeLocaleBeanDao.dropTable(db, ifExists); @@ -86,9 +83,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); 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 4af8a96..fbc78a5 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -41,7 +41,7 @@ private String startTime; private String endTime; private String eorc; - private int pageIndex = 1; + private int page = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh = false; private boolean isLoadMore = false; @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", page); } @Override @@ -85,7 +85,7 @@ public void onRefresh(@NonNull RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; obtainSearchResult(); } }); @@ -93,7 +93,7 @@ @Override public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; obtainSearchResult(); } }); 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 62db8ed..3a2e094 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104251) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 27f60a2..7a5f2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getCheckCaseList(); } private void getCheckCaseList() { - caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getCheckCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getCheckCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getCheckCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104252) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getCheckCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 d8d825f..d80f052 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -34,7 +33,7 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); @@ -80,12 +79,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandledCaseList(requireContext(), pageIndex); + caseViewModel.getHandledCaseList(requireContext(), page); } @Override @@ -94,7 +93,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -102,7 +101,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -113,13 +112,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104288) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 26d0942..0a8b642 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 @@ -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 CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -82,12 +81,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getHandleCaseList(); } private void getHandleCaseList() { - caseViewModel.getHandleCaseList(requireContext(), pageIndex, false); + caseViewModel.getHandleCaseList(requireContext(), page, false); } @Override @@ -96,7 +95,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getHandleCaseList(); } }); @@ -104,7 +103,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getHandleCaseList(); } }); @@ -115,13 +114,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104287) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getHandleCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 3424ebd..8067ff0 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "1", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104284) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 1c2c20d..f9d7b09 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 @@ -4,7 +4,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getOvertimeCaseList(); } private void getOvertimeCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getOvertimeCaseList(requireContext(), "0", pageIndex); + caseViewModel.getOvertimeCaseList(requireContext(), "0", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getOvertimeCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getOvertimeCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104283) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getOvertimeCaseList(); - } - }); + getBinding().emptyView.show(null, "没有超时案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 2cc0a02..ca639b5 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 @@ -3,7 +3,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private NormalRecyclerAdapter adapter; private CaseViewModel caseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getUrgentCaseList(); } private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getUrgentCaseList(requireContext(), "1", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "1", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getUrgentCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getUrgentCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104282) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getUrgentCaseList(); - } - }); + getBinding().emptyView.show(null, "没有紧急案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 54b773e..9fecefd 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 @@ -4,7 +4,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -35,7 +34,7 @@ private CaseViewModel caseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -80,13 +79,13 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getUrgentCaseList(); } private void getUrgentCaseList() { //isSupervise 否 string 是否督办,0-未督办,1-已督办 - caseViewModel.getUrgentCaseList(requireContext(), "0", pageIndex); + caseViewModel.getUrgentCaseList(requireContext(), "0", page); } @Override @@ -95,7 +94,7 @@ @Override public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; - pageIndex = 1; + page = 1; getUrgentCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getUrgentCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104281) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有紧急案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getUrgentCaseList(); - } - }); + getBinding().emptyView.show(null, "没有紧急案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 426878b..75ae9dc 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private NormalRecyclerAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -83,12 +82,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getVerifyCaseList(); } public void getVerifyCaseList() { - caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, true); + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, true); } @Override @@ -98,7 +97,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getVerifyCaseList(); } }); @@ -106,7 +105,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getVerifyCaseList(); } }); @@ -117,13 +116,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104254) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有已办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getVerifyCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有已办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 d5a91fc..0cba2d7 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 @@ -4,7 +4,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; @@ -38,7 +37,7 @@ private NormalRecyclerAdapter adapter; private WeakReferenceHandler weakReferenceHandler; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -84,12 +83,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getVerifyCaseList(); } public void getVerifyCaseList() { - caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, pageIndex, false); + caseViewModel.getVerifyCaseList(requireContext(), LocaleConstant.PAGE_LIMIT, page, false); } @Override @@ -99,7 +98,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getVerifyCaseList(); } }); @@ -107,7 +106,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getVerifyCaseList(); } }); @@ -118,13 +117,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 202104253) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getVerifyCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待办案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { diff --git a/app/src/main/java/com/casic/dcms/greendao/DaoMaster.java b/app/src/main/java/com/casic/dcms/greendao/DaoMaster.java index 8baae67..5f22281 100644 --- a/app/src/main/java/com/casic/dcms/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/dcms/greendao/DaoMaster.java @@ -13,7 +13,6 @@ // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 1): knows all DAOs. */ @@ -29,9 +28,7 @@ ToiletListBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { MapConfigBeanDao.dropTable(db, ifExists); NoticeLocaleBeanDao.dropTable(db, ifExists); @@ -86,9 +83,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); 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 4af8a96..fbc78a5 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -41,7 +41,7 @@ private String startTime; private String endTime; private String eorc; - private int pageIndex = 1; + private int page = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh = false; private boolean isLoadMore = false; @@ -75,7 +75,7 @@ private void obtainSearchResult() { //加载第一页 - caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", pageIndex); + caseViewModel.searchCase(this, eorc, typeCode, typeDetailCode, caseState, startTime, endTime, "0", page); } @Override @@ -85,7 +85,7 @@ public void onRefresh(@NonNull RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; obtainSearchResult(); } }); @@ -93,7 +93,7 @@ @Override public void onLoadMore(@NonNull RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; obtainSearchResult(); } }); diff --git a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java index ba256fc..446defc 100644 --- a/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java +++ b/app/src/main/java/com/casic/dcms/view/streetlight/LampBoxManagerActivity.java @@ -44,7 +44,7 @@ private LampBoxViewModel lampBoxViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; private boolean isControlLampBox = false; @@ -89,7 +89,7 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { lampBoxViewModel = new ViewModelProvider(this).get(LampBoxViewModel.class); - lampBoxViewModel.getLampBoxesByPage(this, pageIndex); + lampBoxViewModel.getLampBoxesByPage(this, page); } @Override @@ -99,16 +99,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - lampBoxViewModel.getLampBoxesByPage(context, pageIndex); + page = 1; + lampBoxViewModel.getLampBoxesByPage(context, page); } }); binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - lampBoxViewModel.getLampBoxesByPage(context, pageIndex); + page++; + lampBoxViewModel.getLampBoxesByPage(context, page); } });