diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 80f7b98..2dcdc64 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -23,11 +23,11 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataRows; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public PackageCaseListAdapter(Context context, List dataRows) { + public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); @@ -58,13 +58,13 @@ } @SuppressLint("NotifyDataSetChanged") - public void refresh(List dataRows) { + public void refresh(List dataRows) { this.dataRows.clear(); this.dataRows.addAll(dataRows); notifyDataSetChanged(); } - public void loadMore(List dataRows) { + public void loadMore(List dataRows) { this.dataRows.addAll(dataRows); notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } @@ -85,7 +85,7 @@ } - void bindView(PackageCaseBean.DataDTO.RowsDTO rowsBean) { + void bindView(PackageCaseBean.DataBean.RowsBean rowsBean) { //三包核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 80f7b98..2dcdc64 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -23,11 +23,11 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataRows; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public PackageCaseListAdapter(Context context, List dataRows) { + public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); @@ -58,13 +58,13 @@ } @SuppressLint("NotifyDataSetChanged") - public void refresh(List dataRows) { + public void refresh(List dataRows) { this.dataRows.clear(); this.dataRows.addAll(dataRows); notifyDataSetChanged(); } - public void loadMore(List dataRows) { + public void loadMore(List dataRows) { this.dataRows.addAll(dataRows); notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } @@ -85,7 +85,7 @@ } - void bindView(PackageCaseBean.DataDTO.RowsDTO rowsBean) { + void bindView(PackageCaseBean.DataBean.RowsBean rowsBean) { //三包核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 93ab96c..06ae702 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -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,8 +30,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private PackageCaseListAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -49,43 +48,11 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - } - - @Override - public void onResume() { - super.onResume(); - getPackageCaseList(); - } - - public void getPackageCaseList() { - caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); - } - - @Override - protected void initEvent() { - getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - //刷新之后页码重置 - pageIndex = 1; - getPackageCaseList(); - } - }); - getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - getPackageCaseList(); - } - }); - caseViewModel.shopCaseModel.observe(this, new Observer() { @Override public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { adapter.refresh(dataRows); getBinding().refreshLayout.finishRefresh(); @@ -104,6 +71,32 @@ } } }); + getPackageCaseList(); + } + + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", page, true); + } + + @Override + protected void initEvent() { + getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + page = 1; + getPackageCaseList(); + } + }); + getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + page++; + getPackageCaseList(); + } + }); } private final Handler.Callback callback = new Handler.Callback() { @@ -111,13 +104,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getPackageCaseList(); - } - }); + getBinding().emptyView.show(null, "没有已处理的案卷"); } else { getBinding().emptyView.hide(); adapter = new PackageCaseListAdapter(requireContext(), dataBeans); diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 80f7b98..2dcdc64 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -23,11 +23,11 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataRows; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public PackageCaseListAdapter(Context context, List dataRows) { + public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); @@ -58,13 +58,13 @@ } @SuppressLint("NotifyDataSetChanged") - public void refresh(List dataRows) { + public void refresh(List dataRows) { this.dataRows.clear(); this.dataRows.addAll(dataRows); notifyDataSetChanged(); } - public void loadMore(List dataRows) { + public void loadMore(List dataRows) { this.dataRows.addAll(dataRows); notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } @@ -85,7 +85,7 @@ } - void bindView(PackageCaseBean.DataDTO.RowsDTO rowsBean) { + void bindView(PackageCaseBean.DataBean.RowsBean rowsBean) { //三包核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 93ab96c..06ae702 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -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,8 +30,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private PackageCaseListAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -49,43 +48,11 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - } - - @Override - public void onResume() { - super.onResume(); - getPackageCaseList(); - } - - public void getPackageCaseList() { - caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); - } - - @Override - protected void initEvent() { - getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - //刷新之后页码重置 - pageIndex = 1; - getPackageCaseList(); - } - }); - getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - getPackageCaseList(); - } - }); - caseViewModel.shopCaseModel.observe(this, new Observer() { @Override public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { adapter.refresh(dataRows); getBinding().refreshLayout.finishRefresh(); @@ -104,6 +71,32 @@ } } }); + getPackageCaseList(); + } + + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", page, true); + } + + @Override + protected void initEvent() { + getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + page = 1; + getPackageCaseList(); + } + }); + getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + page++; + getPackageCaseList(); + } + }); } private final Handler.Callback callback = new Handler.Callback() { @@ -111,13 +104,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getPackageCaseList(); - } - }); + getBinding().emptyView.show(null, "没有已处理的案卷"); } else { getBinding().emptyView.hide(); adapter = new PackageCaseListAdapter(requireContext(), dataBeans); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 1fefd3f..2d1fbc5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -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,8 +31,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private PackageCaseListAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,43 +49,11 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - } - - @Override - public void onResume() { - super.onResume(); - getPackageCaseList(); - } - - public void getPackageCaseList() { - caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); - } - - @Override - protected void initEvent() { - getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - //刷新之后页码重置 - pageIndex = 1; - getPackageCaseList(); - } - }); - getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - getPackageCaseList(); - } - }); - caseViewModel.shopCaseModel.observe(this, new Observer() { @Override public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { adapter.refresh(dataRows); getBinding().refreshLayout.finishRefresh(); @@ -105,6 +72,32 @@ } } }); + getPackageCaseList(); + } + + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", page, false); + } + + @Override + protected void initEvent() { + getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + page = 1; + getPackageCaseList(); + } + }); + getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + page++; + getPackageCaseList(); + } + }); } private final Handler.Callback callback = new Handler.Callback() { @@ -112,13 +105,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getPackageCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new PackageCaseListAdapter(requireContext(), dataBeans); diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 80f7b98..2dcdc64 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -23,11 +23,11 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataRows; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public PackageCaseListAdapter(Context context, List dataRows) { + public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); @@ -58,13 +58,13 @@ } @SuppressLint("NotifyDataSetChanged") - public void refresh(List dataRows) { + public void refresh(List dataRows) { this.dataRows.clear(); this.dataRows.addAll(dataRows); notifyDataSetChanged(); } - public void loadMore(List dataRows) { + public void loadMore(List dataRows) { this.dataRows.addAll(dataRows); notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } @@ -85,7 +85,7 @@ } - void bindView(PackageCaseBean.DataDTO.RowsDTO rowsBean) { + void bindView(PackageCaseBean.DataBean.RowsBean rowsBean) { //三包核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 93ab96c..06ae702 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -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,8 +30,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private PackageCaseListAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -49,43 +48,11 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - } - - @Override - public void onResume() { - super.onResume(); - getPackageCaseList(); - } - - public void getPackageCaseList() { - caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); - } - - @Override - protected void initEvent() { - getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - //刷新之后页码重置 - pageIndex = 1; - getPackageCaseList(); - } - }); - getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - getPackageCaseList(); - } - }); - caseViewModel.shopCaseModel.observe(this, new Observer() { @Override public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { adapter.refresh(dataRows); getBinding().refreshLayout.finishRefresh(); @@ -104,6 +71,32 @@ } } }); + getPackageCaseList(); + } + + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", page, true); + } + + @Override + protected void initEvent() { + getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + page = 1; + getPackageCaseList(); + } + }); + getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + page++; + getPackageCaseList(); + } + }); } private final Handler.Callback callback = new Handler.Callback() { @@ -111,13 +104,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getPackageCaseList(); - } - }); + getBinding().emptyView.show(null, "没有已处理的案卷"); } else { getBinding().emptyView.hide(); adapter = new PackageCaseListAdapter(requireContext(), dataBeans); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 1fefd3f..2d1fbc5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -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,8 +31,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private PackageCaseListAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,43 +49,11 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - } - - @Override - public void onResume() { - super.onResume(); - getPackageCaseList(); - } - - public void getPackageCaseList() { - caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); - } - - @Override - protected void initEvent() { - getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - //刷新之后页码重置 - pageIndex = 1; - getPackageCaseList(); - } - }); - getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - getPackageCaseList(); - } - }); - caseViewModel.shopCaseModel.observe(this, new Observer() { @Override public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { adapter.refresh(dataRows); getBinding().refreshLayout.finishRefresh(); @@ -105,6 +72,32 @@ } } }); + getPackageCaseList(); + } + + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", page, false); + } + + @Override + protected void initEvent() { + getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + page = 1; + getPackageCaseList(); + } + }); + getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + page++; + getPackageCaseList(); + } + }); } private final Handler.Callback callback = new Handler.Callback() { @@ -112,13 +105,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getPackageCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new PackageCaseListAdapter(requireContext(), dataBeans); diff --git a/app/src/main/java/com/casic/dcms/model/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/model/PackageCaseBean.java index 0800669..7dd5b01 100644 --- a/app/src/main/java/com/casic/dcms/model/PackageCaseBean.java +++ b/app/src/main/java/com/casic/dcms/model/PackageCaseBean.java @@ -5,7 +5,7 @@ public class PackageCaseBean { private int code; - private DataDTO data; + private DataBean data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataDTO getData() { + public DataBean getData() { return data; } - public void setData(DataDTO data) { + public void setData(DataBean data) { this.data = data; } @@ -41,15 +41,15 @@ this.success = success; } - public static class DataDTO { - private List rows; + public static class DataBean { + private List rows; private int total; - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } @@ -61,7 +61,7 @@ this.total = total; } - public static class RowsDTO { + public static class RowsBean { private int isPostpone; private String description; private int source; diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 80f7b98..2dcdc64 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -23,11 +23,11 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataRows; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public PackageCaseListAdapter(Context context, List dataRows) { + public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); @@ -58,13 +58,13 @@ } @SuppressLint("NotifyDataSetChanged") - public void refresh(List dataRows) { + public void refresh(List dataRows) { this.dataRows.clear(); this.dataRows.addAll(dataRows); notifyDataSetChanged(); } - public void loadMore(List dataRows) { + public void loadMore(List dataRows) { this.dataRows.addAll(dataRows); notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } @@ -85,7 +85,7 @@ } - void bindView(PackageCaseBean.DataDTO.RowsDTO rowsBean) { + void bindView(PackageCaseBean.DataBean.RowsBean rowsBean) { //三包核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 93ab96c..06ae702 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -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,8 +30,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private PackageCaseListAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -49,43 +48,11 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - } - - @Override - public void onResume() { - super.onResume(); - getPackageCaseList(); - } - - public void getPackageCaseList() { - caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); - } - - @Override - protected void initEvent() { - getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - //刷新之后页码重置 - pageIndex = 1; - getPackageCaseList(); - } - }); - getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - getPackageCaseList(); - } - }); - caseViewModel.shopCaseModel.observe(this, new Observer() { @Override public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { adapter.refresh(dataRows); getBinding().refreshLayout.finishRefresh(); @@ -104,6 +71,32 @@ } } }); + getPackageCaseList(); + } + + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", page, true); + } + + @Override + protected void initEvent() { + getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + page = 1; + getPackageCaseList(); + } + }); + getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + page++; + getPackageCaseList(); + } + }); } private final Handler.Callback callback = new Handler.Callback() { @@ -111,13 +104,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getPackageCaseList(); - } - }); + getBinding().emptyView.show(null, "没有已处理的案卷"); } else { getBinding().emptyView.hide(); adapter = new PackageCaseListAdapter(requireContext(), dataBeans); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 1fefd3f..2d1fbc5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -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,8 +31,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private PackageCaseListAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,43 +49,11 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - } - - @Override - public void onResume() { - super.onResume(); - getPackageCaseList(); - } - - public void getPackageCaseList() { - caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); - } - - @Override - protected void initEvent() { - getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - //刷新之后页码重置 - pageIndex = 1; - getPackageCaseList(); - } - }); - getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - getPackageCaseList(); - } - }); - caseViewModel.shopCaseModel.observe(this, new Observer() { @Override public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { adapter.refresh(dataRows); getBinding().refreshLayout.finishRefresh(); @@ -105,6 +72,32 @@ } } }); + getPackageCaseList(); + } + + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", page, false); + } + + @Override + protected void initEvent() { + getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + page = 1; + getPackageCaseList(); + } + }); + getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + page++; + getPackageCaseList(); + } + }); } private final Handler.Callback callback = new Handler.Callback() { @@ -112,13 +105,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getPackageCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new PackageCaseListAdapter(requireContext(), dataBeans); diff --git a/app/src/main/java/com/casic/dcms/model/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/model/PackageCaseBean.java index 0800669..7dd5b01 100644 --- a/app/src/main/java/com/casic/dcms/model/PackageCaseBean.java +++ b/app/src/main/java/com/casic/dcms/model/PackageCaseBean.java @@ -5,7 +5,7 @@ public class PackageCaseBean { private int code; - private DataDTO data; + private DataBean data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataDTO getData() { + public DataBean getData() { return data; } - public void setData(DataDTO data) { + public void setData(DataBean data) { this.data = data; } @@ -41,15 +41,15 @@ this.success = success; } - public static class DataDTO { - private List rows; + public static class DataBean { + private List rows; private int total; - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } @@ -61,7 +61,7 @@ this.total = total; } - public static class RowsDTO { + public static class RowsBean { private int isPostpone; private String description; private int source; diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 15fdf0b..068f3fb 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -15,6 +15,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.ViewGroupHub; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.widget.TitleBarView; import java.util.ArrayList; import java.util.List; @@ -24,9 +25,17 @@ @Override protected void setupTopBarLayout() { ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { + @Override + public void onLeftClick() { + finish(); + } - binding.titleBarLayout.titleView.setText("三包处置"); - binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + @Override + public void onRightClick() { + + } + }); } @Override diff --git a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java index 80f7b98..2dcdc64 100644 --- a/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/PackageCaseListAdapter.java @@ -23,11 +23,11 @@ private static final String TAG = "PackageCaseAdapter"; private final Context context; - private final List dataRows; + private final List dataRows; private final LayoutInflater layoutInflater; private PunishTypeAdapter adapter; - public PackageCaseListAdapter(Context context, List dataRows) { + public PackageCaseListAdapter(Context context, List dataRows) { this.context = context; this.dataRows = dataRows; layoutInflater = LayoutInflater.from(context); @@ -58,13 +58,13 @@ } @SuppressLint("NotifyDataSetChanged") - public void refresh(List dataRows) { + public void refresh(List dataRows) { this.dataRows.clear(); this.dataRows.addAll(dataRows); notifyDataSetChanged(); } - public void loadMore(List dataRows) { + public void loadMore(List dataRows) { this.dataRows.addAll(dataRows); notifyItemRangeInserted(this.dataRows.size(), dataRows.size()); } @@ -85,7 +85,7 @@ } - void bindView(PackageCaseBean.DataDTO.RowsDTO rowsBean) { + void bindView(PackageCaseBean.DataBean.RowsBean rowsBean) { //三包核实图片 String fileIdVerify = rowsBean.getFileIdVerify(); if (!TextUtils.isEmpty(fileIdVerify)) { diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java index 93ab96c..06ae702 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageHandledFragment.java @@ -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,8 +30,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private PackageCaseListAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -49,43 +48,11 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - } - - @Override - public void onResume() { - super.onResume(); - getPackageCaseList(); - } - - public void getPackageCaseList() { - caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, true); - } - - @Override - protected void initEvent() { - getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - //刷新之后页码重置 - pageIndex = 1; - getPackageCaseList(); - } - }); - getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - getPackageCaseList(); - } - }); - caseViewModel.shopCaseModel.observe(this, new Observer() { @Override public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { adapter.refresh(dataRows); getBinding().refreshLayout.finishRefresh(); @@ -104,6 +71,32 @@ } } }); + getPackageCaseList(); + } + + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", page, true); + } + + @Override + protected void initEvent() { + getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + page = 1; + getPackageCaseList(); + } + }); + getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + page++; + getPackageCaseList(); + } + }); } private final Handler.Callback callback = new Handler.Callback() { @@ -111,13 +104,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060301) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getPackageCaseList(); - } - }); + getBinding().emptyView.show(null, "没有已处理的案卷"); } else { getBinding().emptyView.hide(); adapter = new PackageCaseListAdapter(requireContext(), dataBeans); diff --git a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java index 1fefd3f..2d1fbc5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/business/PackageTodoFragment.java @@ -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,8 +31,8 @@ private WeakReferenceHandler weakReferenceHandler; private CaseViewModel caseViewModel; private PackageCaseListAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private int page = 1; private boolean isRefresh, isLoadMore = false; @Override @@ -50,43 +49,11 @@ protected void initOnCreate(@Nullable Bundle savedInstanceState) { weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - } - - @Override - public void onResume() { - super.onResume(); - getPackageCaseList(); - } - - public void getPackageCaseList() { - caseViewModel.getShopCaseList(requireContext(), "1", pageIndex, false); - } - - @Override - protected void initEvent() { - getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - //刷新之后页码重置 - pageIndex = 1; - getPackageCaseList(); - } - }); - getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - getPackageCaseList(); - } - }); - caseViewModel.shopCaseModel.observe(this, new Observer() { @Override public void onChanged(PackageCaseBean resultBean) { if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); + List dataRows = resultBean.getData().getRows(); if (isRefresh) { adapter.refresh(dataRows); getBinding().refreshLayout.finishRefresh(); @@ -105,6 +72,32 @@ } } }); + getPackageCaseList(); + } + + public void getPackageCaseList() { + caseViewModel.getShopCaseList(requireContext(), "1", page, false); + } + + @Override + protected void initEvent() { + getBinding().refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + //刷新之后页码重置 + page = 1; + getPackageCaseList(); + } + }); + getBinding().refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + page++; + getPackageCaseList(); + } + }); } private final Handler.Callback callback = new Handler.Callback() { @@ -112,13 +105,7 @@ public boolean handleMessage(@NonNull Message msg) { if (msg.what == 2021060302) { if (dataBeans.size() == 0) { - getBinding().emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - getPackageCaseList(); - } - }); + getBinding().emptyView.show(null, "没有案卷需要处理"); } else { getBinding().emptyView.hide(); adapter = new PackageCaseListAdapter(requireContext(), dataBeans); diff --git a/app/src/main/java/com/casic/dcms/model/PackageCaseBean.java b/app/src/main/java/com/casic/dcms/model/PackageCaseBean.java index 0800669..7dd5b01 100644 --- a/app/src/main/java/com/casic/dcms/model/PackageCaseBean.java +++ b/app/src/main/java/com/casic/dcms/model/PackageCaseBean.java @@ -5,7 +5,7 @@ public class PackageCaseBean { private int code; - private DataDTO data; + private DataBean data; private String message; private boolean success; @@ -17,11 +17,11 @@ this.code = code; } - public DataDTO getData() { + public DataBean getData() { return data; } - public void setData(DataDTO data) { + public void setData(DataBean data) { this.data = data; } @@ -41,15 +41,15 @@ this.success = success; } - public static class DataDTO { - private List rows; + public static class DataBean { + private List rows; private int total; - public List getRows() { + public List getRows() { return rows; } - public void setRows(List rows) { + public void setRows(List rows) { this.rows = rows; } @@ -61,7 +61,7 @@ this.total = total; } - public static class RowsDTO { + public static class RowsBean { private int isPostpone; private String description; private int source; diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java index 15fdf0b..068f3fb 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageCaseActivity.java @@ -15,6 +15,7 @@ import com.casic.dcms.utils.LocaleConstant; import com.casic.dcms.utils.ViewGroupHub; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; +import com.pengxh.androidx.lite.widget.TitleBarView; import java.util.ArrayList; import java.util.List; @@ -24,9 +25,17 @@ @Override protected void setupTopBarLayout() { ViewGroupHub.initImmersionBar(binding.rootView, this, true, R.color.white); + binding.titleView.setOnClickListener(new TitleBarView.OnClickListener() { + @Override + public void onLeftClick() { + finish(); + } - binding.titleBarLayout.titleView.setText("三包处置"); - binding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + @Override + public void onRightClick() { + + } + }); } @Override diff --git a/app/src/main/res/layout/activity_three_package.xml b/app/src/main/res/layout/activity_three_package.xml index 3dfbe8e..4822338 100644 --- a/app/src/main/res/layout/activity_three_package.xml +++ b/app/src/main/res/layout/activity_three_package.xml @@ -6,9 +6,16 @@ android:layout_height="match_parent" android:orientation="vertical"> - +