diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java deleted file mode 100644 index 4a949d0..0000000 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.casic.dcms.fragment.handle; - -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import com.casic.dcms.R; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.view.handle.CaseHandleDetailActivity; -import com.casic.dcms.vm.CaseViewModel; -import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; -import com.pengxh.androidx.lite.adapter.ViewHolder; -import com.pengxh.androidx.lite.base.AndroidxBaseFragment; -import com.pengxh.androidx.lite.hub.StringHub; -import com.pengxh.androidx.lite.utils.WeakReferenceHandler; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.util.ArrayList; -import java.util.List; - -public class CaseOverTimeFragment extends AndroidxBaseFragment { - - private static final String TAG = "OvertimeCaseFragment"; - private WeakReferenceHandler weakReferenceHandler; - private CaseViewModel caseViewModel; - private NormalRecyclerAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; - private boolean isRefresh, isLoadMore = false; - - @Override - protected void setupTopBarLayout() { - - } - - @Override - protected void observeRequestState() { - - } - - @Override - protected void initData() { - weakReferenceHandler = new WeakReferenceHandler(callback); - caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.caseHandleModel.observe(this, new Observer() { - @Override - public void onChanged(CaseHandleBean resultBean) { - if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - adapter.setRefreshData(dataRows); - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - StringHub.show(requireContext(), "到底了，别拉了"); - } - adapter.setLoadMoreData(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - weakReferenceHandler.sendEmptyMessage(202104285); - } - } - } - }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; - obtainHandleCaseList(); - } - - private void obtainHandleCaseList() { - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseViewModel.obtainHandleCaseList("1", null, pageIndex, false); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - obtainHandleCaseList(); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - obtainHandleCaseList(); - } - }); - } - - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 202104285) { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } - } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } - } - return true; - } - }; -} diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java deleted file mode 100644 index 4a949d0..0000000 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.casic.dcms.fragment.handle; - -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import com.casic.dcms.R; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.view.handle.CaseHandleDetailActivity; -import com.casic.dcms.vm.CaseViewModel; -import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; -import com.pengxh.androidx.lite.adapter.ViewHolder; -import com.pengxh.androidx.lite.base.AndroidxBaseFragment; -import com.pengxh.androidx.lite.hub.StringHub; -import com.pengxh.androidx.lite.utils.WeakReferenceHandler; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.util.ArrayList; -import java.util.List; - -public class CaseOverTimeFragment extends AndroidxBaseFragment { - - private static final String TAG = "OvertimeCaseFragment"; - private WeakReferenceHandler weakReferenceHandler; - private CaseViewModel caseViewModel; - private NormalRecyclerAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; - private boolean isRefresh, isLoadMore = false; - - @Override - protected void setupTopBarLayout() { - - } - - @Override - protected void observeRequestState() { - - } - - @Override - protected void initData() { - weakReferenceHandler = new WeakReferenceHandler(callback); - caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.caseHandleModel.observe(this, new Observer() { - @Override - public void onChanged(CaseHandleBean resultBean) { - if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - adapter.setRefreshData(dataRows); - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - StringHub.show(requireContext(), "到底了，别拉了"); - } - adapter.setLoadMoreData(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - weakReferenceHandler.sendEmptyMessage(202104285); - } - } - } - }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; - obtainHandleCaseList(); - } - - private void obtainHandleCaseList() { - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseViewModel.obtainHandleCaseList("1", null, pageIndex, false); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - obtainHandleCaseList(); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - obtainHandleCaseList(); - } - }); - } - - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 202104285) { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } - } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } - } - return true; - } - }; -} diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 4dcad4a..c504007 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -89,7 +89,7 @@ * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 */ - caseViewModel.obtainHandleCaseList(null, null, pageIndex, false); + caseViewModel.obtainHandleCaseList(pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java deleted file mode 100644 index 4a949d0..0000000 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.casic.dcms.fragment.handle; - -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import com.casic.dcms.R; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.view.handle.CaseHandleDetailActivity; -import com.casic.dcms.vm.CaseViewModel; -import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; -import com.pengxh.androidx.lite.adapter.ViewHolder; -import com.pengxh.androidx.lite.base.AndroidxBaseFragment; -import com.pengxh.androidx.lite.hub.StringHub; -import com.pengxh.androidx.lite.utils.WeakReferenceHandler; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.util.ArrayList; -import java.util.List; - -public class CaseOverTimeFragment extends AndroidxBaseFragment { - - private static final String TAG = "OvertimeCaseFragment"; - private WeakReferenceHandler weakReferenceHandler; - private CaseViewModel caseViewModel; - private NormalRecyclerAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; - private boolean isRefresh, isLoadMore = false; - - @Override - protected void setupTopBarLayout() { - - } - - @Override - protected void observeRequestState() { - - } - - @Override - protected void initData() { - weakReferenceHandler = new WeakReferenceHandler(callback); - caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.caseHandleModel.observe(this, new Observer() { - @Override - public void onChanged(CaseHandleBean resultBean) { - if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - adapter.setRefreshData(dataRows); - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - StringHub.show(requireContext(), "到底了，别拉了"); - } - adapter.setLoadMoreData(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - weakReferenceHandler.sendEmptyMessage(202104285); - } - } - } - }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; - obtainHandleCaseList(); - } - - private void obtainHandleCaseList() { - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseViewModel.obtainHandleCaseList("1", null, pageIndex, false); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - obtainHandleCaseList(); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - obtainHandleCaseList(); - } - }); - } - - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 202104285) { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } - } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } - } - return true; - } - }; -} diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 4dcad4a..c504007 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -89,7 +89,7 @@ * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 */ - caseViewModel.obtainHandleCaseList(null, null, pageIndex, false); + caseViewModel.obtainHandleCaseList(pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java deleted file mode 100644 index b38231e..0000000 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.casic.dcms.fragment.handle; - -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import com.casic.dcms.R; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.view.handle.CaseHandleDetailActivity; -import com.casic.dcms.vm.CaseViewModel; -import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; -import com.pengxh.androidx.lite.adapter.ViewHolder; -import com.pengxh.androidx.lite.base.AndroidxBaseFragment; -import com.pengxh.androidx.lite.hub.StringHub; -import com.pengxh.androidx.lite.utils.WeakReferenceHandler; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.util.ArrayList; -import java.util.List; - -public class CaseUrgentFragment extends AndroidxBaseFragment { - - private static final String TAG = "UrgentCaseFragment"; - private WeakReferenceHandler weakReferenceHandler; - private CaseViewModel caseViewModel; - private NormalRecyclerAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; - private boolean isRefresh, isLoadMore = false; - - @Override - protected void setupTopBarLayout() { - - } - - @Override - protected void observeRequestState() { - - } - - @Override - protected void initData() { - weakReferenceHandler = new WeakReferenceHandler(callback); - caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.caseHandleModel.observe(this, new Observer() { - @Override - public void onChanged(CaseHandleBean resultBean) { - if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - adapter.setRefreshData(dataRows); - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - StringHub.show(requireContext(), "到底了，别拉了"); - } - adapter.setLoadMoreData(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - weakReferenceHandler.sendEmptyMessage(202104286); - } - } - } - }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; - obtainHandleCaseList(); - } - - private void obtainHandleCaseList() { - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseViewModel.obtainHandleCaseList(null, "1", pageIndex, false); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - obtainHandleCaseList(); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - obtainHandleCaseList(); - } - }); - } - - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 202104286) { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } - } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } - } - return true; - } - }; -} diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java deleted file mode 100644 index 4a949d0..0000000 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.casic.dcms.fragment.handle; - -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import com.casic.dcms.R; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.view.handle.CaseHandleDetailActivity; -import com.casic.dcms.vm.CaseViewModel; -import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; -import com.pengxh.androidx.lite.adapter.ViewHolder; -import com.pengxh.androidx.lite.base.AndroidxBaseFragment; -import com.pengxh.androidx.lite.hub.StringHub; -import com.pengxh.androidx.lite.utils.WeakReferenceHandler; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.util.ArrayList; -import java.util.List; - -public class CaseOverTimeFragment extends AndroidxBaseFragment { - - private static final String TAG = "OvertimeCaseFragment"; - private WeakReferenceHandler weakReferenceHandler; - private CaseViewModel caseViewModel; - private NormalRecyclerAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; - private boolean isRefresh, isLoadMore = false; - - @Override - protected void setupTopBarLayout() { - - } - - @Override - protected void observeRequestState() { - - } - - @Override - protected void initData() { - weakReferenceHandler = new WeakReferenceHandler(callback); - caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.caseHandleModel.observe(this, new Observer() { - @Override - public void onChanged(CaseHandleBean resultBean) { - if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - adapter.setRefreshData(dataRows); - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - StringHub.show(requireContext(), "到底了，别拉了"); - } - adapter.setLoadMoreData(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - weakReferenceHandler.sendEmptyMessage(202104285); - } - } - } - }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; - obtainHandleCaseList(); - } - - private void obtainHandleCaseList() { - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseViewModel.obtainHandleCaseList("1", null, pageIndex, false); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - obtainHandleCaseList(); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - obtainHandleCaseList(); - } - }); - } - - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 202104285) { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } - } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } - } - return true; - } - }; -} diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 4dcad4a..c504007 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -89,7 +89,7 @@ * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 */ - caseViewModel.obtainHandleCaseList(null, null, pageIndex, false); + caseViewModel.obtainHandleCaseList(pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java deleted file mode 100644 index b38231e..0000000 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.casic.dcms.fragment.handle; - -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import com.casic.dcms.R; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.view.handle.CaseHandleDetailActivity; -import com.casic.dcms.vm.CaseViewModel; -import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; -import com.pengxh.androidx.lite.adapter.ViewHolder; -import com.pengxh.androidx.lite.base.AndroidxBaseFragment; -import com.pengxh.androidx.lite.hub.StringHub; -import com.pengxh.androidx.lite.utils.WeakReferenceHandler; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.util.ArrayList; -import java.util.List; - -public class CaseUrgentFragment extends AndroidxBaseFragment { - - private static final String TAG = "UrgentCaseFragment"; - private WeakReferenceHandler weakReferenceHandler; - private CaseViewModel caseViewModel; - private NormalRecyclerAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; - private boolean isRefresh, isLoadMore = false; - - @Override - protected void setupTopBarLayout() { - - } - - @Override - protected void observeRequestState() { - - } - - @Override - protected void initData() { - weakReferenceHandler = new WeakReferenceHandler(callback); - caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.caseHandleModel.observe(this, new Observer() { - @Override - public void onChanged(CaseHandleBean resultBean) { - if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - adapter.setRefreshData(dataRows); - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - StringHub.show(requireContext(), "到底了，别拉了"); - } - adapter.setLoadMoreData(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - weakReferenceHandler.sendEmptyMessage(202104286); - } - } - } - }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; - obtainHandleCaseList(); - } - - private void obtainHandleCaseList() { - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseViewModel.obtainHandleCaseList(null, "1", pageIndex, false); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - obtainHandleCaseList(); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - obtainHandleCaseList(); - } - }); - } - - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 202104286) { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } - } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } - } - return true; - } - }; -} diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 285dc80..fd30762 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -386,15 +386,11 @@ /** * 处理待办分页查询 * - * @param isOvertime 是否超时,null-所有案卷,1-超时案卷 - * @param isEmergent 是否紧急,null-所有案卷,1-紧急案卷 * @param isShop 是否三包,0-普通案卷,1-三包案卷 */ @GET("/case/toHandleListPage") Observable getHandleResult( @Header("token") String token, - @Query("isOvertime") String isOvertime, - @Query("isEmergent") String isEmergent, @Query("isShop") String isShop, @Query("limit") int limit, @Query("offset") int offset diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java deleted file mode 100644 index 4a949d0..0000000 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.casic.dcms.fragment.handle; - -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import com.casic.dcms.R; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.view.handle.CaseHandleDetailActivity; -import com.casic.dcms.vm.CaseViewModel; -import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; -import com.pengxh.androidx.lite.adapter.ViewHolder; -import com.pengxh.androidx.lite.base.AndroidxBaseFragment; -import com.pengxh.androidx.lite.hub.StringHub; -import com.pengxh.androidx.lite.utils.WeakReferenceHandler; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.util.ArrayList; -import java.util.List; - -public class CaseOverTimeFragment extends AndroidxBaseFragment { - - private static final String TAG = "OvertimeCaseFragment"; - private WeakReferenceHandler weakReferenceHandler; - private CaseViewModel caseViewModel; - private NormalRecyclerAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; - private boolean isRefresh, isLoadMore = false; - - @Override - protected void setupTopBarLayout() { - - } - - @Override - protected void observeRequestState() { - - } - - @Override - protected void initData() { - weakReferenceHandler = new WeakReferenceHandler(callback); - caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.caseHandleModel.observe(this, new Observer() { - @Override - public void onChanged(CaseHandleBean resultBean) { - if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - adapter.setRefreshData(dataRows); - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - StringHub.show(requireContext(), "到底了，别拉了"); - } - adapter.setLoadMoreData(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - weakReferenceHandler.sendEmptyMessage(202104285); - } - } - } - }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; - obtainHandleCaseList(); - } - - private void obtainHandleCaseList() { - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseViewModel.obtainHandleCaseList("1", null, pageIndex, false); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - obtainHandleCaseList(); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - obtainHandleCaseList(); - } - }); - } - - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 202104285) { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } - } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } - } - return true; - } - }; -} diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 4dcad4a..c504007 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -89,7 +89,7 @@ * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 */ - caseViewModel.obtainHandleCaseList(null, null, pageIndex, false); + caseViewModel.obtainHandleCaseList(pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java deleted file mode 100644 index b38231e..0000000 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.casic.dcms.fragment.handle; - -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import com.casic.dcms.R; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.view.handle.CaseHandleDetailActivity; -import com.casic.dcms.vm.CaseViewModel; -import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; -import com.pengxh.androidx.lite.adapter.ViewHolder; -import com.pengxh.androidx.lite.base.AndroidxBaseFragment; -import com.pengxh.androidx.lite.hub.StringHub; -import com.pengxh.androidx.lite.utils.WeakReferenceHandler; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.util.ArrayList; -import java.util.List; - -public class CaseUrgentFragment extends AndroidxBaseFragment { - - private static final String TAG = "UrgentCaseFragment"; - private WeakReferenceHandler weakReferenceHandler; - private CaseViewModel caseViewModel; - private NormalRecyclerAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; - private boolean isRefresh, isLoadMore = false; - - @Override - protected void setupTopBarLayout() { - - } - - @Override - protected void observeRequestState() { - - } - - @Override - protected void initData() { - weakReferenceHandler = new WeakReferenceHandler(callback); - caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.caseHandleModel.observe(this, new Observer() { - @Override - public void onChanged(CaseHandleBean resultBean) { - if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - adapter.setRefreshData(dataRows); - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - StringHub.show(requireContext(), "到底了，别拉了"); - } - adapter.setLoadMoreData(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - weakReferenceHandler.sendEmptyMessage(202104286); - } - } - } - }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; - obtainHandleCaseList(); - } - - private void obtainHandleCaseList() { - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseViewModel.obtainHandleCaseList(null, "1", pageIndex, false); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - obtainHandleCaseList(); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - obtainHandleCaseList(); - } - }); - } - - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 202104286) { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } - } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } - } - return true; - } - }; -} diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 285dc80..fd30762 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -386,15 +386,11 @@ /** * 处理待办分页查询 * - * @param isOvertime 是否超时,null-所有案卷,1-超时案卷 - * @param isEmergent 是否紧急,null-所有案卷,1-紧急案卷 * @param isShop 是否三包,0-普通案卷,1-三包案卷 */ @GET("/case/toHandleListPage") Observable getHandleResult( @Header("token") String token, - @Query("isOvertime") String isOvertime, - @Query("isEmergent") String isEmergent, @Query("isShop") String isShop, @Query("limit") int limit, @Query("offset") int offset diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index a03ca81..a35ba05 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -315,11 +315,9 @@ /** * 案卷处理分页查询，去掉三包类型的案卷 */ - public static Observable handleCaseResult( - String isOvertime, String isEmergent, int limit, int offset - ) { + public static Observable handleCaseResult(int limit, int offset) { return api.getHandleResult( - AuthenticationHelper.getToken(), isOvertime, isEmergent, "0", limit, offset + AuthenticationHelper.getToken(), "0", limit, offset ); } diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java deleted file mode 100644 index 4a949d0..0000000 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.casic.dcms.fragment.handle; - -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import com.casic.dcms.R; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.view.handle.CaseHandleDetailActivity; -import com.casic.dcms.vm.CaseViewModel; -import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; -import com.pengxh.androidx.lite.adapter.ViewHolder; -import com.pengxh.androidx.lite.base.AndroidxBaseFragment; -import com.pengxh.androidx.lite.hub.StringHub; -import com.pengxh.androidx.lite.utils.WeakReferenceHandler; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.util.ArrayList; -import java.util.List; - -public class CaseOverTimeFragment extends AndroidxBaseFragment { - - private static final String TAG = "OvertimeCaseFragment"; - private WeakReferenceHandler weakReferenceHandler; - private CaseViewModel caseViewModel; - private NormalRecyclerAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; - private boolean isRefresh, isLoadMore = false; - - @Override - protected void setupTopBarLayout() { - - } - - @Override - protected void observeRequestState() { - - } - - @Override - protected void initData() { - weakReferenceHandler = new WeakReferenceHandler(callback); - caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.caseHandleModel.observe(this, new Observer() { - @Override - public void onChanged(CaseHandleBean resultBean) { - if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - adapter.setRefreshData(dataRows); - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - StringHub.show(requireContext(), "到底了，别拉了"); - } - adapter.setLoadMoreData(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - weakReferenceHandler.sendEmptyMessage(202104285); - } - } - } - }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; - obtainHandleCaseList(); - } - - private void obtainHandleCaseList() { - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseViewModel.obtainHandleCaseList("1", null, pageIndex, false); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - obtainHandleCaseList(); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - obtainHandleCaseList(); - } - }); - } - - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 202104285) { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } - } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } - } - return true; - } - }; -} diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 4dcad4a..c504007 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -89,7 +89,7 @@ * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 */ - caseViewModel.obtainHandleCaseList(null, null, pageIndex, false); + caseViewModel.obtainHandleCaseList(pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java deleted file mode 100644 index b38231e..0000000 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.casic.dcms.fragment.handle; - -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import com.casic.dcms.R; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.view.handle.CaseHandleDetailActivity; -import com.casic.dcms.vm.CaseViewModel; -import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; -import com.pengxh.androidx.lite.adapter.ViewHolder; -import com.pengxh.androidx.lite.base.AndroidxBaseFragment; -import com.pengxh.androidx.lite.hub.StringHub; -import com.pengxh.androidx.lite.utils.WeakReferenceHandler; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.util.ArrayList; -import java.util.List; - -public class CaseUrgentFragment extends AndroidxBaseFragment { - - private static final String TAG = "UrgentCaseFragment"; - private WeakReferenceHandler weakReferenceHandler; - private CaseViewModel caseViewModel; - private NormalRecyclerAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; - private boolean isRefresh, isLoadMore = false; - - @Override - protected void setupTopBarLayout() { - - } - - @Override - protected void observeRequestState() { - - } - - @Override - protected void initData() { - weakReferenceHandler = new WeakReferenceHandler(callback); - caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.caseHandleModel.observe(this, new Observer() { - @Override - public void onChanged(CaseHandleBean resultBean) { - if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - adapter.setRefreshData(dataRows); - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - StringHub.show(requireContext(), "到底了，别拉了"); - } - adapter.setLoadMoreData(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - weakReferenceHandler.sendEmptyMessage(202104286); - } - } - } - }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; - obtainHandleCaseList(); - } - - private void obtainHandleCaseList() { - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseViewModel.obtainHandleCaseList(null, "1", pageIndex, false); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - obtainHandleCaseList(); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - obtainHandleCaseList(); - } - }); - } - - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 202104286) { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } - } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } - } - return true; - } - }; -} diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 285dc80..fd30762 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -386,15 +386,11 @@ /** * 处理待办分页查询 * - * @param isOvertime 是否超时,null-所有案卷,1-超时案卷 - * @param isEmergent 是否紧急,null-所有案卷,1-紧急案卷 * @param isShop 是否三包,0-普通案卷,1-三包案卷 */ @GET("/case/toHandleListPage") Observable getHandleResult( @Header("token") String token, - @Query("isOvertime") String isOvertime, - @Query("isEmergent") String isEmergent, @Query("isShop") String isShop, @Query("limit") int limit, @Query("offset") int offset diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index a03ca81..a35ba05 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -315,11 +315,9 @@ /** * 案卷处理分页查询，去掉三包类型的案卷 */ - public static Observable handleCaseResult( - String isOvertime, String isEmergent, int limit, int offset - ) { + public static Observable handleCaseResult(int limit, int offset) { return api.getHandleResult( - AuthenticationHelper.getToken(), isOvertime, isEmergent, "0", limit, offset + AuthenticationHelper.getToken(), "0", limit, offset ); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index 607ef1a..91a0666 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -8,9 +8,7 @@ import com.casic.dcms.adapter.SubViewPagerAdapter; import com.casic.dcms.databinding.ActivityCaseHandleBinding; import com.casic.dcms.fragment.handle.CaseHandledFragment; -import com.casic.dcms.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; -import com.casic.dcms.fragment.handle.CaseUrgentFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -22,7 +20,7 @@ public class HandleCaseActivity extends AndroidxBaseActivity { - private final String[] pageTitles = new String[]{"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; + private final String[] pageTitles = new String[]{"待办案卷", "已办案卷"}; @Override protected void setupTopBarLayout() { @@ -41,8 +39,6 @@ @Override protected void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseOverTimeFragment()); - fragmentList.add(new CaseUrgentFragment()); fragmentList.add(new CaseTodoFragment()); fragmentList.add(new CaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), pageTitles, fragmentList); diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java deleted file mode 100644 index 4a949d0..0000000 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.casic.dcms.fragment.handle; - -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import com.casic.dcms.R; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.view.handle.CaseHandleDetailActivity; -import com.casic.dcms.vm.CaseViewModel; -import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; -import com.pengxh.androidx.lite.adapter.ViewHolder; -import com.pengxh.androidx.lite.base.AndroidxBaseFragment; -import com.pengxh.androidx.lite.hub.StringHub; -import com.pengxh.androidx.lite.utils.WeakReferenceHandler; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.util.ArrayList; -import java.util.List; - -public class CaseOverTimeFragment extends AndroidxBaseFragment { - - private static final String TAG = "OvertimeCaseFragment"; - private WeakReferenceHandler weakReferenceHandler; - private CaseViewModel caseViewModel; - private NormalRecyclerAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; - private boolean isRefresh, isLoadMore = false; - - @Override - protected void setupTopBarLayout() { - - } - - @Override - protected void observeRequestState() { - - } - - @Override - protected void initData() { - weakReferenceHandler = new WeakReferenceHandler(callback); - caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.caseHandleModel.observe(this, new Observer() { - @Override - public void onChanged(CaseHandleBean resultBean) { - if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - adapter.setRefreshData(dataRows); - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - StringHub.show(requireContext(), "到底了，别拉了"); - } - adapter.setLoadMoreData(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - weakReferenceHandler.sendEmptyMessage(202104285); - } - } - } - }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; - obtainHandleCaseList(); - } - - private void obtainHandleCaseList() { - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseViewModel.obtainHandleCaseList("1", null, pageIndex, false); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - obtainHandleCaseList(); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - obtainHandleCaseList(); - } - }); - } - - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 202104285) { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } - } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } - } - return true; - } - }; -} diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 4dcad4a..c504007 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -89,7 +89,7 @@ * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 */ - caseViewModel.obtainHandleCaseList(null, null, pageIndex, false); + caseViewModel.obtainHandleCaseList(pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java deleted file mode 100644 index b38231e..0000000 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.casic.dcms.fragment.handle; - -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import com.casic.dcms.R; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.view.handle.CaseHandleDetailActivity; -import com.casic.dcms.vm.CaseViewModel; -import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; -import com.pengxh.androidx.lite.adapter.ViewHolder; -import com.pengxh.androidx.lite.base.AndroidxBaseFragment; -import com.pengxh.androidx.lite.hub.StringHub; -import com.pengxh.androidx.lite.utils.WeakReferenceHandler; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.util.ArrayList; -import java.util.List; - -public class CaseUrgentFragment extends AndroidxBaseFragment { - - private static final String TAG = "UrgentCaseFragment"; - private WeakReferenceHandler weakReferenceHandler; - private CaseViewModel caseViewModel; - private NormalRecyclerAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; - private boolean isRefresh, isLoadMore = false; - - @Override - protected void setupTopBarLayout() { - - } - - @Override - protected void observeRequestState() { - - } - - @Override - protected void initData() { - weakReferenceHandler = new WeakReferenceHandler(callback); - caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.caseHandleModel.observe(this, new Observer() { - @Override - public void onChanged(CaseHandleBean resultBean) { - if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - adapter.setRefreshData(dataRows); - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - StringHub.show(requireContext(), "到底了，别拉了"); - } - adapter.setLoadMoreData(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - weakReferenceHandler.sendEmptyMessage(202104286); - } - } - } - }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; - obtainHandleCaseList(); - } - - private void obtainHandleCaseList() { - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseViewModel.obtainHandleCaseList(null, "1", pageIndex, false); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - obtainHandleCaseList(); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - obtainHandleCaseList(); - } - }); - } - - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 202104286) { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } - } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } - } - return true; - } - }; -} diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 285dc80..fd30762 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -386,15 +386,11 @@ /** * 处理待办分页查询 * - * @param isOvertime 是否超时,null-所有案卷,1-超时案卷 - * @param isEmergent 是否紧急,null-所有案卷,1-紧急案卷 * @param isShop 是否三包,0-普通案卷,1-三包案卷 */ @GET("/case/toHandleListPage") Observable getHandleResult( @Header("token") String token, - @Query("isOvertime") String isOvertime, - @Query("isEmergent") String isEmergent, @Query("isShop") String isShop, @Query("limit") int limit, @Query("offset") int offset diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index a03ca81..a35ba05 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -315,11 +315,9 @@ /** * 案卷处理分页查询，去掉三包类型的案卷 */ - public static Observable handleCaseResult( - String isOvertime, String isEmergent, int limit, int offset - ) { + public static Observable handleCaseResult(int limit, int offset) { return api.getHandleResult( - AuthenticationHelper.getToken(), isOvertime, isEmergent, "0", limit, offset + AuthenticationHelper.getToken(), "0", limit, offset ); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index 607ef1a..91a0666 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -8,9 +8,7 @@ import com.casic.dcms.adapter.SubViewPagerAdapter; import com.casic.dcms.databinding.ActivityCaseHandleBinding; import com.casic.dcms.fragment.handle.CaseHandledFragment; -import com.casic.dcms.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; -import com.casic.dcms.fragment.handle.CaseUrgentFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -22,7 +20,7 @@ public class HandleCaseActivity extends AndroidxBaseActivity { - private final String[] pageTitles = new String[]{"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; + private final String[] pageTitles = new String[]{"待办案卷", "已办案卷"}; @Override protected void setupTopBarLayout() { @@ -41,8 +39,6 @@ @Override protected void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseOverTimeFragment()); - fragmentList.add(new CaseUrgentFragment()); fragmentList.add(new CaseTodoFragment()); fragmentList.add(new CaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), pageTitles, fragmentList); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e4e42b3..bda5a20 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(null, null, 1, true); + caseViewModel.obtainHandleCaseList(1, true); viewBinding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 viewBinding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(null, null, 1, true); + caseViewModel.obtainHandleCaseList(1, true); break; case 1: viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java deleted file mode 100644 index 4a949d0..0000000 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseOverTimeFragment.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.casic.dcms.fragment.handle; - -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import com.casic.dcms.R; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.view.handle.CaseHandleDetailActivity; -import com.casic.dcms.vm.CaseViewModel; -import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; -import com.pengxh.androidx.lite.adapter.ViewHolder; -import com.pengxh.androidx.lite.base.AndroidxBaseFragment; -import com.pengxh.androidx.lite.hub.StringHub; -import com.pengxh.androidx.lite.utils.WeakReferenceHandler; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.util.ArrayList; -import java.util.List; - -public class CaseOverTimeFragment extends AndroidxBaseFragment { - - private static final String TAG = "OvertimeCaseFragment"; - private WeakReferenceHandler weakReferenceHandler; - private CaseViewModel caseViewModel; - private NormalRecyclerAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; - private boolean isRefresh, isLoadMore = false; - - @Override - protected void setupTopBarLayout() { - - } - - @Override - protected void observeRequestState() { - - } - - @Override - protected void initData() { - weakReferenceHandler = new WeakReferenceHandler(callback); - caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.caseHandleModel.observe(this, new Observer() { - @Override - public void onChanged(CaseHandleBean resultBean) { - if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - adapter.setRefreshData(dataRows); - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - StringHub.show(requireContext(), "到底了，别拉了"); - } - adapter.setLoadMoreData(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - weakReferenceHandler.sendEmptyMessage(202104285); - } - } - } - }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; - obtainHandleCaseList(); - } - - private void obtainHandleCaseList() { - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseViewModel.obtainHandleCaseList("1", null, pageIndex, false); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - obtainHandleCaseList(); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - obtainHandleCaseList(); - } - }); - } - - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 202104285) { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } - } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } - } - return true; - } - }; -} diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java index 4dcad4a..c504007 100644 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/handle/CaseTodoFragment.java @@ -89,7 +89,7 @@ * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 */ - caseViewModel.obtainHandleCaseList(null, null, pageIndex, false); + caseViewModel.obtainHandleCaseList(pageIndex, false); } @Override diff --git a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java deleted file mode 100644 index b38231e..0000000 --- a/app/src/main/java/com/casic/dcms/fragment/handle/CaseUrgentFragment.java +++ /dev/null @@ -1,160 +0,0 @@ -package com.casic.dcms.fragment.handle; - -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProvider; - -import com.casic.dcms.R; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.model.CaseHandleBean; -import com.casic.dcms.utils.StringHelper; -import com.casic.dcms.view.handle.CaseHandleDetailActivity; -import com.casic.dcms.vm.CaseViewModel; -import com.pengxh.androidx.lite.adapter.NormalRecyclerAdapter; -import com.pengxh.androidx.lite.adapter.ViewHolder; -import com.pengxh.androidx.lite.base.AndroidxBaseFragment; -import com.pengxh.androidx.lite.hub.StringHub; -import com.pengxh.androidx.lite.utils.WeakReferenceHandler; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.util.ArrayList; -import java.util.List; - -public class CaseUrgentFragment extends AndroidxBaseFragment { - - private static final String TAG = "UrgentCaseFragment"; - private WeakReferenceHandler weakReferenceHandler; - private CaseViewModel caseViewModel; - private NormalRecyclerAdapter adapter; - private List dataBeans = new ArrayList<>(); - private int pageIndex = 1; - private boolean isRefresh, isLoadMore = false; - - @Override - protected void setupTopBarLayout() { - - } - - @Override - protected void observeRequestState() { - - } - - @Override - protected void initData() { - weakReferenceHandler = new WeakReferenceHandler(callback); - caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); - caseViewModel.caseHandleModel.observe(this, new Observer() { - @Override - public void onChanged(CaseHandleBean resultBean) { - if (resultBean.getCode() == 200) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - adapter.setRefreshData(dataRows); - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - StringHub.show(requireContext(), "到底了，别拉了"); - } - adapter.setLoadMoreData(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - weakReferenceHandler.sendEmptyMessage(202104286); - } - } - } - }); - } - - @Override - public void onResume() { - super.onResume(); - pageIndex = 1; - obtainHandleCaseList(); - } - - private void obtainHandleCaseList() { - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseViewModel.obtainHandleCaseList(null, "1", pageIndex, false); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - obtainHandleCaseList(); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - obtainHandleCaseList(); - } - }); - } - - private final Handler.Callback callback = new Handler.Callback() { - @Override - public boolean handleMessage(@NonNull Message msg) { - if (msg.what == 202104286) { - if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "没有案卷需要处理", null, "刷新", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainHandleCaseList(); - } - }); - } else { - viewBinding.emptyView.hide(); - adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { - @Override - public void convertView(ViewHolder viewHolder, int position, CaseHandleBean.DataModel.RowsModel item) { - String fileIdVerify = item.getFileIdVerify(); - if (!TextUtils.isEmpty(fileIdVerify)) { - String[] split = fileIdVerify.split(","); - String firstImage = split[0]; - if (firstImage.endsWith(".jpg") || firstImage.contains(".jpeg") || firstImage.contains(".png")) { - viewHolder.setImageResource(R.id.caseImageView, StringHelper.appendCompleteURL(firstImage)); - } - } - viewHolder.setText(R.id.caseTitleView, StringHub.filterSpaceOrEnter(item.getDescription())) - .setText(R.id.casePlaceView, "发生地点：" + StringHub.filterSpaceOrEnter(item.getFieldintro())) - .setText(R.id.caseTimeView, "上报时间：" + item.getReportTime()); - } - }; - viewBinding.caseRecyclerView.setAdapter(adapter); - adapter.setOnItemClickedListener(new NormalRecyclerAdapter.OnItemClickedListener() { - @Override - public void onItemClicked(int position, CaseHandleBean.DataModel.RowsModel rowsModel) { - Intent intent = new Intent(requireContext(), CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", rowsModel.getId()); - startActivity(intent); - } - }); - } - } - return true; - } - }; -} diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index 285dc80..fd30762 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -386,15 +386,11 @@ /** * 处理待办分页查询 * - * @param isOvertime 是否超时,null-所有案卷,1-超时案卷 - * @param isEmergent 是否紧急,null-所有案卷,1-紧急案卷 * @param isShop 是否三包,0-普通案卷,1-三包案卷 */ @GET("/case/toHandleListPage") Observable getHandleResult( @Header("token") String token, - @Query("isOvertime") String isOvertime, - @Query("isEmergent") String isEmergent, @Query("isShop") String isShop, @Query("limit") int limit, @Query("offset") int offset diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index a03ca81..a35ba05 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -315,11 +315,9 @@ /** * 案卷处理分页查询，去掉三包类型的案卷 */ - public static Observable handleCaseResult( - String isOvertime, String isEmergent, int limit, int offset - ) { + public static Observable handleCaseResult(int limit, int offset) { return api.getHandleResult( - AuthenticationHelper.getToken(), isOvertime, isEmergent, "0", limit, offset + AuthenticationHelper.getToken(), "0", limit, offset ); } diff --git a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java index 607ef1a..91a0666 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/HandleCaseActivity.java @@ -8,9 +8,7 @@ import com.casic.dcms.adapter.SubViewPagerAdapter; import com.casic.dcms.databinding.ActivityCaseHandleBinding; import com.casic.dcms.fragment.handle.CaseHandledFragment; -import com.casic.dcms.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.fragment.handle.CaseTodoFragment; -import com.casic.dcms.fragment.handle.CaseUrgentFragment; import com.casic.dcms.utils.LinearLayoutHelper; import com.gyf.immersionbar.ImmersionBar; import com.pengxh.androidx.lite.base.AndroidxBaseActivity; @@ -22,7 +20,7 @@ public class HandleCaseActivity extends AndroidxBaseActivity { - private final String[] pageTitles = new String[]{"超时案卷", "紧急案卷", "待办案卷", "已办案卷"}; + private final String[] pageTitles = new String[]{"待办案卷", "已办案卷"}; @Override protected void setupTopBarLayout() { @@ -41,8 +39,6 @@ @Override protected void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseOverTimeFragment()); - fragmentList.add(new CaseUrgentFragment()); fragmentList.add(new CaseTodoFragment()); fragmentList.add(new CaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), pageTitles, fragmentList); diff --git a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java index e4e42b3..bda5a20 100644 --- a/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/view/map/CaseOnMapActivity.java @@ -82,7 +82,7 @@ weakReferenceHandler = new WeakReferenceHandler(callback); caseViewModel = new ViewModelProvider(this).get(CaseViewModel.class); //默认加载处置中数据 - caseViewModel.obtainHandleCaseList(null, null, 1, true); + caseViewModel.obtainHandleCaseList(1, true); viewBinding.mapView.setAttributionTextVisible(false);//去掉左下角属性标识 viewBinding.mapView.setViewpointScaleAsync(64000); @@ -287,7 +287,7 @@ viewBinding.checkRadioButton.setTextColor(IntHub.convertColor(this, R.color.mainTextColor)); //请求处置中数据 - caseViewModel.obtainHandleCaseList(null, null, 1, true); + caseViewModel.obtainHandleCaseList(1, true); break; case 1: viewBinding.verifyRadioButton.setTextColor(IntHub.convertColor(this, R.color.white)); diff --git a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java index 68175d8..84b3791 100644 --- a/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java +++ b/app/src/main/java/com/casic/dcms/vm/CaseViewModel.java @@ -123,12 +123,12 @@ }); } - public void obtainHandleCaseList(String isOvertime, String isEmergent, int offset, boolean isOnMap) { + public void obtainHandleCaseList(int offset, boolean isOnMap) { Observable observable; if (isOnMap) { - observable = RetrofitServiceManager.handleCaseResult(null, null, 1000, 1); + observable = RetrofitServiceManager.handleCaseResult(1000, 1); } else { - observable = RetrofitServiceManager.handleCaseResult(isOvertime, isEmergent, LocaleConstant.PAGE_LIMIT, offset); + observable = RetrofitServiceManager.handleCaseResult(LocaleConstant.PAGE_LIMIT, offset); } ObserverSubscriber.addSubscribe(observable, new OnObserverCallback() { @Override