diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 659369f..75feb7c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -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; @@ -32,9 +31,9 @@ private WeakReferenceHandler weakReferenceHandler; private NormalRecyclerAdapter adapter; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptAdjustCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptAdjustCaseListModel.observe(this, new Observer() { @Override public void onChanged(AdjustCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page++; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 659369f..75feb7c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -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; @@ -32,9 +31,9 @@ private WeakReferenceHandler weakReferenceHandler; private NormalRecyclerAdapter adapter; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptAdjustCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptAdjustCaseListModel.observe(this, new Observer() { @Override public void onChanged(AdjustCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page++; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 98a241d..9637045 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -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; @@ -32,9 +31,9 @@ private WeakReferenceHandler weakReferenceHandler; private NormalRecyclerAdapter adapter; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptAuthorizeCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptAuthorizeCaseListModel.observe(this, new Observer() { @Override public void onChanged(AuthorizeCaseModel resultBean) { if (resultBean.getCode() == 200) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page++; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 659369f..75feb7c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -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; @@ -32,9 +31,9 @@ private WeakReferenceHandler weakReferenceHandler; private NormalRecyclerAdapter adapter; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptAdjustCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptAdjustCaseListModel.observe(this, new Observer() { @Override public void onChanged(AdjustCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page++; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 98a241d..9637045 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -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; @@ -32,9 +31,9 @@ private WeakReferenceHandler weakReferenceHandler; private NormalRecyclerAdapter adapter; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptAuthorizeCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptAuthorizeCaseListModel.observe(this, new Observer() { @Override public void onChanged(AuthorizeCaseModel resultBean) { if (resultBean.getCode() == 200) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page++; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index f2ff800..2e3ad6d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -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; @@ -31,10 +30,10 @@ public class DeptCaseDelayedFragment extends AndroidxBaseFragment { private WeakReferenceHandler weakReferenceHandler; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptDelayedCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptDelayedCaseListModel.observe(this, new Observer() { @Override public void onChanged(DelayedCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, true); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); + page++; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, true); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 659369f..75feb7c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -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; @@ -32,9 +31,9 @@ private WeakReferenceHandler weakReferenceHandler; private NormalRecyclerAdapter adapter; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptAdjustCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptAdjustCaseListModel.observe(this, new Observer() { @Override public void onChanged(AdjustCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page++; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 98a241d..9637045 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -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; @@ -32,9 +31,9 @@ private WeakReferenceHandler weakReferenceHandler; private NormalRecyclerAdapter adapter; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptAuthorizeCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptAuthorizeCaseListModel.observe(this, new Observer() { @Override public void onChanged(AuthorizeCaseModel resultBean) { if (resultBean.getCode() == 200) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page++; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index f2ff800..2e3ad6d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -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; @@ -31,10 +30,10 @@ public class DeptCaseDelayedFragment extends AndroidxBaseFragment { private WeakReferenceHandler weakReferenceHandler; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptDelayedCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptDelayedCaseListModel.observe(this, new Observer() { @Override public void onChanged(DelayedCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, true); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); + page++; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, true); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 78f82af..1743dae 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -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; @@ -33,10 +32,10 @@ public class DeptCaseHandledFragment extends AndroidxBaseFragment { private WeakReferenceHandler weakReferenceHandler; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -52,8 +51,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptHandledCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptHandledCaseListModel.observe(this, new Observer() { @Override public void onChanged(HandledCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -81,12 +80,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } private void getDeptStatusCaseList() { - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, "handled"); } @Override @@ -96,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } }); @@ -104,7 +103,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getDeptStatusCaseList(); } }); @@ -115,13 +114,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getDeptStatusCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有处理任何案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 659369f..75feb7c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -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; @@ -32,9 +31,9 @@ private WeakReferenceHandler weakReferenceHandler; private NormalRecyclerAdapter adapter; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptAdjustCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptAdjustCaseListModel.observe(this, new Observer() { @Override public void onChanged(AdjustCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page++; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 98a241d..9637045 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -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; @@ -32,9 +31,9 @@ private WeakReferenceHandler weakReferenceHandler; private NormalRecyclerAdapter adapter; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptAuthorizeCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptAuthorizeCaseListModel.observe(this, new Observer() { @Override public void onChanged(AuthorizeCaseModel resultBean) { if (resultBean.getCode() == 200) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page++; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index f2ff800..2e3ad6d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -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; @@ -31,10 +30,10 @@ public class DeptCaseDelayedFragment extends AndroidxBaseFragment { private WeakReferenceHandler weakReferenceHandler; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptDelayedCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptDelayedCaseListModel.observe(this, new Observer() { @Override public void onChanged(DelayedCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, true); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); + page++; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, true); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 78f82af..1743dae 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -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; @@ -33,10 +32,10 @@ public class DeptCaseHandledFragment extends AndroidxBaseFragment { private WeakReferenceHandler weakReferenceHandler; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -52,8 +51,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptHandledCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptHandledCaseListModel.observe(this, new Observer() { @Override public void onChanged(HandledCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -81,12 +80,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } private void getDeptStatusCaseList() { - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, "handled"); } @Override @@ -96,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } }); @@ -104,7 +103,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getDeptStatusCaseList(); } }); @@ -115,13 +114,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getDeptStatusCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有处理任何案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 0b6c73e..1e6ffe7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -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; @@ -31,10 +30,10 @@ public class DeptCasePostponeFragment extends AndroidxBaseFragment { private WeakReferenceHandler weakReferenceHandler; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptPostBeanCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptPostBeanCaseListModel.observe(this, new Observer() { @Override public void onChanged(PostCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, false); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); + page++; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, false); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); - } - }); + 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/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 659369f..75feb7c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -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; @@ -32,9 +31,9 @@ private WeakReferenceHandler weakReferenceHandler; private NormalRecyclerAdapter adapter; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptAdjustCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptAdjustCaseListModel.observe(this, new Observer() { @Override public void onChanged(AdjustCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page++; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 98a241d..9637045 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -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; @@ -32,9 +31,9 @@ private WeakReferenceHandler weakReferenceHandler; private NormalRecyclerAdapter adapter; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptAuthorizeCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptAuthorizeCaseListModel.observe(this, new Observer() { @Override public void onChanged(AuthorizeCaseModel resultBean) { if (resultBean.getCode() == 200) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page++; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index f2ff800..2e3ad6d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -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; @@ -31,10 +30,10 @@ public class DeptCaseDelayedFragment extends AndroidxBaseFragment { private WeakReferenceHandler weakReferenceHandler; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptDelayedCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptDelayedCaseListModel.observe(this, new Observer() { @Override public void onChanged(DelayedCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, true); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); + page++; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, true); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 78f82af..1743dae 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -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; @@ -33,10 +32,10 @@ public class DeptCaseHandledFragment extends AndroidxBaseFragment { private WeakReferenceHandler weakReferenceHandler; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -52,8 +51,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptHandledCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptHandledCaseListModel.observe(this, new Observer() { @Override public void onChanged(HandledCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -81,12 +80,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } private void getDeptStatusCaseList() { - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, "handled"); } @Override @@ -96,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } }); @@ -104,7 +103,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getDeptStatusCaseList(); } }); @@ -115,13 +114,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getDeptStatusCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有处理任何案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 0b6c73e..1e6ffe7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -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; @@ -31,10 +30,10 @@ public class DeptCasePostponeFragment extends AndroidxBaseFragment { private WeakReferenceHandler weakReferenceHandler; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptPostBeanCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptPostBeanCaseListModel.observe(this, new Observer() { @Override public void onChanged(PostCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, false); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); + page++; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, false); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); - } - }); + 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/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 4130326..935e9c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -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; @@ -32,10 +31,10 @@ public class DeptCaseProcessFragment extends AndroidxBaseFragment { private WeakReferenceHandler weakReferenceHandler; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -51,8 +50,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptHandleCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptHandleCaseListModel.observe(this, new Observer() { @Override public void onChanged(HandleCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -80,12 +79,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } private void getDeptStatusCaseList() { - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, "process"); } @Override @@ -95,7 +94,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getDeptStatusCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getDeptStatusCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待处理案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java index 659369f..75feb7c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAdjustFragment.java @@ -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; @@ -32,9 +31,9 @@ private WeakReferenceHandler weakReferenceHandler; private NormalRecyclerAdapter adapter; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptAdjustCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptAdjustCaseListModel.observe(this, new Observer() { @Override public void onChanged(AdjustCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); + page++; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, true); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062107) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "暂时没有需要调整的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseAuthorizeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java index 98a241d..9637045 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseAuthorizeFragment.java @@ -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; @@ -32,9 +31,9 @@ private WeakReferenceHandler weakReferenceHandler; private NormalRecyclerAdapter adapter; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptAuthorizeCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptAuthorizeCaseListModel.observe(this, new Observer() { @Override public void onChanged(AuthorizeCaseModel resultBean) { if (resultBean.getCode() == 200) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, false); + page++; + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, false); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062106) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "暂时没有需要授权的案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseDelayedFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java index f2ff800..2e3ad6d 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseDelayedFragment.java @@ -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; @@ -31,10 +30,10 @@ public class DeptCaseDelayedFragment extends AndroidxBaseFragment { private WeakReferenceHandler weakReferenceHandler; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptDelayedCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptDelayedCaseListModel.observe(this, new Observer() { @Override public void onChanged(DelayedCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, true); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, true); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); + page++; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, true); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062105) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, true); - } - }); + 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/department/DeptCaseHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java index 78f82af..1743dae 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseHandledFragment.java @@ -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; @@ -33,10 +32,10 @@ public class DeptCaseHandledFragment extends AndroidxBaseFragment { private WeakReferenceHandler weakReferenceHandler; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -52,8 +51,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptHandledCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptHandledCaseListModel.observe(this, new Observer() { @Override public void onChanged(HandledCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -81,12 +80,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } private void getDeptStatusCaseList() { - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "handled"); + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, "handled"); } @Override @@ -96,7 +95,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } }); @@ -104,7 +103,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getDeptStatusCaseList(); } }); @@ -115,13 +114,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062104) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您还没有处理任何案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getDeptStatusCaseList(); - } - }); + getBinding().emptyView.show(null, "您还没有处理任何案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java index 0b6c73e..1e6ffe7 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCasePostponeFragment.java @@ -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; @@ -31,10 +30,10 @@ public class DeptCasePostponeFragment extends AndroidxBaseFragment { private WeakReferenceHandler weakReferenceHandler; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,8 +49,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptPostBeanCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptPostBeanCaseListModel.observe(this, new Observer() { @Override public void onChanged(PostCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -79,8 +78,8 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, false); } @Override @@ -90,16 +89,16 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); + page = 1; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, false); } }); getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); + page++; + deptCaseViewModel.getDelayedOrPostCaseList(requireContext(), page, false); } }); } @@ -109,13 +108,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062103) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待办案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - handleViewModel.getDelayedOrPostCaseList(requireContext(), pageIndex, false); - } - }); + 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/department/DeptCaseProcessFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java index 4130326..935e9c5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseProcessFragment.java @@ -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; @@ -32,10 +31,10 @@ public class DeptCaseProcessFragment extends AndroidxBaseFragment { private WeakReferenceHandler weakReferenceHandler; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -51,8 +50,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptHandleCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptHandleCaseListModel.observe(this, new Observer() { @Override public void onChanged(HandleCaseModel resultBean) { if (resultBean.isSuccess()) { @@ -80,12 +79,12 @@ @Override public void onResume() { super.onResume(); - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } private void getDeptStatusCaseList() { - handleViewModel.getDeptStatusCaseList(requireContext(), pageIndex, "process"); + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, "process"); } @Override @@ -95,7 +94,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; //刷新之后页码重置 - pageIndex = 1; + page = 1; getDeptStatusCaseList(); } }); @@ -103,7 +102,7 @@ @Override public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; - pageIndex++; + page++; getDeptStatusCaseList(); } }); @@ -114,13 +113,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021062102) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "您暂时没有待处理案卷", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getDeptStatusCaseList(); - } - }); + getBinding().emptyView.show(null, "您暂时没有待处理案卷"); } else { getBinding().emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { diff --git a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java index 3dedb3b..f94a87f 100644 --- a/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/department/DeptCaseTodoFragment.java @@ -33,7 +33,7 @@ public class DeptCaseTodoFragment extends AndroidxBaseFragment { private WeakReferenceHandler weakReferenceHandler; - private DeptCaseViewModel handleViewModel; + private DeptCaseViewModel deptCaseViewModel; private NormalRecyclerAdapter adapter; private List dataBeans = new ArrayList<>(); private int page = 1; @@ -52,8 +52,8 @@ @Override protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); - handleViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); - handleViewModel.deptTodoCaseListModel.observe(this, new Observer() { + deptCaseViewModel = new ViewModelProvider(this).get(DeptCaseViewModel.class); + deptCaseViewModel.deptTodoCaseListModel.observe(this, new Observer() { @Override public void onChanged(TodoCaseModel resultBean) { if (resultBean.getCode() == 200) { @@ -80,7 +80,7 @@ } private void getDeptStatusCaseList() { - handleViewModel.getDeptStatusCaseList(requireContext(), page, "todo"); + deptCaseViewModel.getDeptStatusCaseList(requireContext(), page, "todo"); } @Override