diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 6967e37..c097722 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.databinding.ActivityMapCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -54,11 +54,11 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; private ListenableList graphicsOverlays; @@ -94,7 +94,7 @@ viewBinding.mapView.setMap(arcGISMap); caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); + caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 @@ -219,7 +219,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核实数据 - caseVerifyPresenter.onReadyRetrofitRequest(1000, 1); + caseVerifyPresenter.onReadyRetrofitRequest(1000, 1, false); break; case 2: viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -227,7 +227,7 @@ viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核查数据 - caseCheckPresenter.onReadyRetrofitRequest(1000, 1); + caseCheckPresenter.onReadyRetrofitRequest(1000, 1, false); break; default: break; @@ -283,8 +283,7 @@ * 待核实 */ @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -314,8 +313,7 @@ * 待核查 */ @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 6967e37..c097722 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.databinding.ActivityMapCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -54,11 +54,11 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; private ListenableList graphicsOverlays; @@ -94,7 +94,7 @@ viewBinding.mapView.setMap(arcGISMap); caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); + caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 @@ -219,7 +219,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核实数据 - caseVerifyPresenter.onReadyRetrofitRequest(1000, 1); + caseVerifyPresenter.onReadyRetrofitRequest(1000, 1, false); break; case 2: viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -227,7 +227,7 @@ viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核查数据 - caseCheckPresenter.onReadyRetrofitRequest(1000, 1); + caseCheckPresenter.onReadyRetrofitRequest(1000, 1, false); break; default: break; @@ -283,8 +283,7 @@ * 待核实 */ @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -314,8 +313,7 @@ * 待核查 */ @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java deleted file mode 100644 index 1e1a60c..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseVerifyBinding; -import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; -import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -public class CaseVerifyActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核实"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseVerifyFragment()); - fragmentList.add(new CaseVerifiedFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.verifyViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 6967e37..c097722 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.databinding.ActivityMapCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -54,11 +54,11 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; private ListenableList graphicsOverlays; @@ -94,7 +94,7 @@ viewBinding.mapView.setMap(arcGISMap); caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); + caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 @@ -219,7 +219,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核实数据 - caseVerifyPresenter.onReadyRetrofitRequest(1000, 1); + caseVerifyPresenter.onReadyRetrofitRequest(1000, 1, false); break; case 2: viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -227,7 +227,7 @@ viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核查数据 - caseCheckPresenter.onReadyRetrofitRequest(1000, 1); + caseCheckPresenter.onReadyRetrofitRequest(1000, 1, false); break; default: break; @@ -283,8 +283,7 @@ * 待核实 */ @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -314,8 +313,7 @@ * 待核查 */ @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java deleted file mode 100644 index 1e1a60c..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseVerifyBinding; -import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; -import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -public class CaseVerifyActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核实"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseVerifyFragment()); - fragmentList.add(new CaseVerifiedFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.verifyViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java new file mode 100644 index 0000000..e48ddad --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java @@ -0,0 +1,51 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityCheckCaseBinding; +import com.casic.dcms.ui.fragment.check.CaseCheckFragment; +import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/16 9:24 + * @email : 290677893@qq.com + */ +public class CheckCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核查"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseCheckFragment()); + fragmentList.add(new CaseCheckedFragment()); + SubViewPagerAdapter adapter = new + SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.checkViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 6967e37..c097722 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.databinding.ActivityMapCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -54,11 +54,11 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; private ListenableList graphicsOverlays; @@ -94,7 +94,7 @@ viewBinding.mapView.setMap(arcGISMap); caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); + caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 @@ -219,7 +219,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核实数据 - caseVerifyPresenter.onReadyRetrofitRequest(1000, 1); + caseVerifyPresenter.onReadyRetrofitRequest(1000, 1, false); break; case 2: viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -227,7 +227,7 @@ viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核查数据 - caseCheckPresenter.onReadyRetrofitRequest(1000, 1); + caseCheckPresenter.onReadyRetrofitRequest(1000, 1, false); break; default: break; @@ -283,8 +283,7 @@ * 待核实 */ @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -314,8 +313,7 @@ * 待核查 */ @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java deleted file mode 100644 index 1e1a60c..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseVerifyBinding; -import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; -import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -public class CaseVerifyActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核实"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseVerifyFragment()); - fragmentList.add(new CaseVerifiedFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.verifyViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java new file mode 100644 index 0000000..e48ddad --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java @@ -0,0 +1,51 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityCheckCaseBinding; +import com.casic.dcms.ui.fragment.check.CaseCheckFragment; +import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/16 9:24 + * @email : 290677893@qq.com + */ +public class CheckCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核查"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseCheckFragment()); + fragmentList.add(new CaseCheckedFragment()); + SubViewPagerAdapter adapter = new + SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.checkViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java new file mode 100644 index 0000000..5633eed --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java @@ -0,0 +1,45 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityVerifyCaseBinding; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +public class VerifyCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核实"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseVerifyFragment()); + fragmentList.add(new CaseVerifiedFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.verifyViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 6967e37..c097722 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.databinding.ActivityMapCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -54,11 +54,11 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; private ListenableList graphicsOverlays; @@ -94,7 +94,7 @@ viewBinding.mapView.setMap(arcGISMap); caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); + caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 @@ -219,7 +219,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核实数据 - caseVerifyPresenter.onReadyRetrofitRequest(1000, 1); + caseVerifyPresenter.onReadyRetrofitRequest(1000, 1, false); break; case 2: viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -227,7 +227,7 @@ viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核查数据 - caseCheckPresenter.onReadyRetrofitRequest(1000, 1); + caseCheckPresenter.onReadyRetrofitRequest(1000, 1, false); break; default: break; @@ -283,8 +283,7 @@ * 待核实 */ @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -314,8 +313,7 @@ * 待核查 */ @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java deleted file mode 100644 index 1e1a60c..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseVerifyBinding; -import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; -import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -public class CaseVerifyActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核实"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseVerifyFragment()); - fragmentList.add(new CaseVerifiedFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.verifyViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java new file mode 100644 index 0000000..e48ddad --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java @@ -0,0 +1,51 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityCheckCaseBinding; +import com.casic.dcms.ui.fragment.check.CaseCheckFragment; +import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/16 9:24 + * @email : 290677893@qq.com + */ +public class CheckCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核查"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseCheckFragment()); + fragmentList.add(new CaseCheckedFragment()); + SubViewPagerAdapter adapter = new + SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.checkViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java new file mode 100644 index 0000000..5633eed --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java @@ -0,0 +1,45 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityVerifyCaseBinding; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +public class VerifyCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核实"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseVerifyFragment()); + fragmentList.add(new CaseVerifiedFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.verifyViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index aa89910..da3b461 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -15,15 +15,14 @@ import com.casic.dcms.databinding.FragmentHomeBinding; import com.casic.dcms.mvp.presenter.impl.GetHomePagePresenterImpl; import com.casic.dcms.mvp.presenter.impl.GetUserDataPresenterImpl; +import com.casic.dcms.mvp.view.IGetHomePageView; import com.casic.dcms.mvp.view.IGetUserDataView; -import com.casic.dcms.mvp.view.IHomePageView; import com.casic.dcms.ui.BridgeMaintainActivity; -import com.casic.dcms.ui.CaseCheckActivity; import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CheckCaseActivity; import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; @@ -36,6 +35,7 @@ import com.casic.dcms.ui.QuickCaseUploadActivity; import com.casic.dcms.ui.StreetlightManagerActivity; import com.casic.dcms.ui.UrgentCaseActivity; +import com.casic.dcms.ui.VerifyCaseActivity; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -44,7 +44,8 @@ import java.util.GregorianCalendar; -public class HomePageFragment extends AndroidxBaseFragment implements IGetUserDataView, IHomePageView { +public class HomePageFragment extends AndroidxBaseFragment + implements IGetUserDataView, IGetHomePageView { private Context context; private GetUserDataPresenterImpl userDataPresenter; @@ -127,10 +128,10 @@ intent.setClass(context, PackageCaseUploadActivity.class); break; case "案卷核实": - intent.setClass(context, CaseVerifyActivity.class); + intent.setClass(context, VerifyCaseActivity.class); break; case "案卷核查": - intent.setClass(context, CaseCheckActivity.class); + intent.setClass(context, CheckCaseActivity.class); break; case "案卷处理": intent.setClass(context, CaseHandleActivity.class); diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 6967e37..c097722 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.databinding.ActivityMapCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -54,11 +54,11 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; private ListenableList graphicsOverlays; @@ -94,7 +94,7 @@ viewBinding.mapView.setMap(arcGISMap); caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); + caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 @@ -219,7 +219,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核实数据 - caseVerifyPresenter.onReadyRetrofitRequest(1000, 1); + caseVerifyPresenter.onReadyRetrofitRequest(1000, 1, false); break; case 2: viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -227,7 +227,7 @@ viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核查数据 - caseCheckPresenter.onReadyRetrofitRequest(1000, 1); + caseCheckPresenter.onReadyRetrofitRequest(1000, 1, false); break; default: break; @@ -283,8 +283,7 @@ * 待核实 */ @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -314,8 +313,7 @@ * 待核查 */ @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java deleted file mode 100644 index 1e1a60c..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseVerifyBinding; -import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; -import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -public class CaseVerifyActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核实"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseVerifyFragment()); - fragmentList.add(new CaseVerifiedFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.verifyViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java new file mode 100644 index 0000000..e48ddad --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java @@ -0,0 +1,51 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityCheckCaseBinding; +import com.casic.dcms.ui.fragment.check.CaseCheckFragment; +import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/16 9:24 + * @email : 290677893@qq.com + */ +public class CheckCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核查"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseCheckFragment()); + fragmentList.add(new CaseCheckedFragment()); + SubViewPagerAdapter adapter = new + SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.checkViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java new file mode 100644 index 0000000..5633eed --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java @@ -0,0 +1,45 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityVerifyCaseBinding; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +public class VerifyCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核实"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseVerifyFragment()); + fragmentList.add(new CaseVerifiedFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.verifyViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index aa89910..da3b461 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -15,15 +15,14 @@ import com.casic.dcms.databinding.FragmentHomeBinding; import com.casic.dcms.mvp.presenter.impl.GetHomePagePresenterImpl; import com.casic.dcms.mvp.presenter.impl.GetUserDataPresenterImpl; +import com.casic.dcms.mvp.view.IGetHomePageView; import com.casic.dcms.mvp.view.IGetUserDataView; -import com.casic.dcms.mvp.view.IHomePageView; import com.casic.dcms.ui.BridgeMaintainActivity; -import com.casic.dcms.ui.CaseCheckActivity; import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CheckCaseActivity; import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; @@ -36,6 +35,7 @@ import com.casic.dcms.ui.QuickCaseUploadActivity; import com.casic.dcms.ui.StreetlightManagerActivity; import com.casic.dcms.ui.UrgentCaseActivity; +import com.casic.dcms.ui.VerifyCaseActivity; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -44,7 +44,8 @@ import java.util.GregorianCalendar; -public class HomePageFragment extends AndroidxBaseFragment implements IGetUserDataView, IHomePageView { +public class HomePageFragment extends AndroidxBaseFragment + implements IGetUserDataView, IGetHomePageView { private Context context; private GetUserDataPresenterImpl userDataPresenter; @@ -127,10 +128,10 @@ intent.setClass(context, PackageCaseUploadActivity.class); break; case "案卷核实": - intent.setClass(context, CaseVerifyActivity.class); + intent.setClass(context, VerifyCaseActivity.class); break; case "案卷核查": - intent.setClass(context, CaseCheckActivity.class); + intent.setClass(context, CheckCaseActivity.class); break; case "案卷处理": intent.setClass(context, CaseHandleActivity.class); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 51947e9..a8ce821 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -16,7 +16,7 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckFragment"; private Context context; - private CaseCheckPresenterImpl caseCheckPresenter; + private CaseCheckPresenterImpl checkPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseCheckPresenter = new CaseCheckPresenterImpl(this); - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter = new CaseCheckPresenterImpl(this); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; - checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + checkFragment.checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex, false); } else if (msg.what == 202104251) { if (checkFragment.isRefresh || checkFragment.isLoadMore) { checkFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseCheckPresenter != null) { - caseCheckPresenter.disposeRetrofitRequest(); + if (checkPresenter != null) { + checkPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 6967e37..c097722 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.databinding.ActivityMapCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -54,11 +54,11 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; private ListenableList graphicsOverlays; @@ -94,7 +94,7 @@ viewBinding.mapView.setMap(arcGISMap); caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); + caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 @@ -219,7 +219,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核实数据 - caseVerifyPresenter.onReadyRetrofitRequest(1000, 1); + caseVerifyPresenter.onReadyRetrofitRequest(1000, 1, false); break; case 2: viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -227,7 +227,7 @@ viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核查数据 - caseCheckPresenter.onReadyRetrofitRequest(1000, 1); + caseCheckPresenter.onReadyRetrofitRequest(1000, 1, false); break; default: break; @@ -283,8 +283,7 @@ * 待核实 */ @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -314,8 +313,7 @@ * 待核查 */ @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java deleted file mode 100644 index 1e1a60c..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseVerifyBinding; -import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; -import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -public class CaseVerifyActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核实"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseVerifyFragment()); - fragmentList.add(new CaseVerifiedFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.verifyViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java new file mode 100644 index 0000000..e48ddad --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java @@ -0,0 +1,51 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityCheckCaseBinding; +import com.casic.dcms.ui.fragment.check.CaseCheckFragment; +import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/16 9:24 + * @email : 290677893@qq.com + */ +public class CheckCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核查"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseCheckFragment()); + fragmentList.add(new CaseCheckedFragment()); + SubViewPagerAdapter adapter = new + SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.checkViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java new file mode 100644 index 0000000..5633eed --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java @@ -0,0 +1,45 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityVerifyCaseBinding; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +public class VerifyCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核实"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseVerifyFragment()); + fragmentList.add(new CaseVerifiedFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.verifyViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index aa89910..da3b461 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -15,15 +15,14 @@ import com.casic.dcms.databinding.FragmentHomeBinding; import com.casic.dcms.mvp.presenter.impl.GetHomePagePresenterImpl; import com.casic.dcms.mvp.presenter.impl.GetUserDataPresenterImpl; +import com.casic.dcms.mvp.view.IGetHomePageView; import com.casic.dcms.mvp.view.IGetUserDataView; -import com.casic.dcms.mvp.view.IHomePageView; import com.casic.dcms.ui.BridgeMaintainActivity; -import com.casic.dcms.ui.CaseCheckActivity; import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CheckCaseActivity; import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; @@ -36,6 +35,7 @@ import com.casic.dcms.ui.QuickCaseUploadActivity; import com.casic.dcms.ui.StreetlightManagerActivity; import com.casic.dcms.ui.UrgentCaseActivity; +import com.casic.dcms.ui.VerifyCaseActivity; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -44,7 +44,8 @@ import java.util.GregorianCalendar; -public class HomePageFragment extends AndroidxBaseFragment implements IGetUserDataView, IHomePageView { +public class HomePageFragment extends AndroidxBaseFragment + implements IGetUserDataView, IGetHomePageView { private Context context; private GetUserDataPresenterImpl userDataPresenter; @@ -127,10 +128,10 @@ intent.setClass(context, PackageCaseUploadActivity.class); break; case "案卷核实": - intent.setClass(context, CaseVerifyActivity.class); + intent.setClass(context, VerifyCaseActivity.class); break; case "案卷核查": - intent.setClass(context, CaseCheckActivity.class); + intent.setClass(context, CheckCaseActivity.class); break; case "案卷处理": intent.setClass(context, CaseHandleActivity.class); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 51947e9..a8ce821 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -16,7 +16,7 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckFragment"; private Context context; - private CaseCheckPresenterImpl caseCheckPresenter; + private CaseCheckPresenterImpl checkPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseCheckPresenter = new CaseCheckPresenterImpl(this); - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter = new CaseCheckPresenterImpl(this); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; - checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + checkFragment.checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex, false); } else if (msg.what == 202104251) { if (checkFragment.isRefresh || checkFragment.isLoadMore) { checkFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseCheckPresenter != null) { - caseCheckPresenter.disposeRetrofitRequest(); + if (checkPresenter != null) { + checkPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index f0feb0c..2dd96b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckedFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckedFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckedFragment"; private Context context; - private CaseCheckedPresenterImpl caseCheckedPresenter; + private CaseCheckPresenterImpl checkedPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; private List dataBeans = new ArrayList<>(); @@ -46,8 +46,8 @@ @Override protected void initData() { - caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter = new CaseCheckPresenterImpl(this); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -60,7 +60,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -68,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -98,7 +98,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); + checkedFragment.checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex, true); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,8 +127,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -152,8 +151,8 @@ @Override public void onDestroyView() { - if (caseCheckedPresenter != null) { - caseCheckedPresenter.disposeRetrofitRequest(); + if (checkedPresenter != null) { + checkedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 6967e37..c097722 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.databinding.ActivityMapCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -54,11 +54,11 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; private ListenableList graphicsOverlays; @@ -94,7 +94,7 @@ viewBinding.mapView.setMap(arcGISMap); caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); + caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 @@ -219,7 +219,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核实数据 - caseVerifyPresenter.onReadyRetrofitRequest(1000, 1); + caseVerifyPresenter.onReadyRetrofitRequest(1000, 1, false); break; case 2: viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -227,7 +227,7 @@ viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核查数据 - caseCheckPresenter.onReadyRetrofitRequest(1000, 1); + caseCheckPresenter.onReadyRetrofitRequest(1000, 1, false); break; default: break; @@ -283,8 +283,7 @@ * 待核实 */ @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -314,8 +313,7 @@ * 待核查 */ @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java deleted file mode 100644 index 1e1a60c..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseVerifyBinding; -import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; -import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -public class CaseVerifyActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核实"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseVerifyFragment()); - fragmentList.add(new CaseVerifiedFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.verifyViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java new file mode 100644 index 0000000..e48ddad --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java @@ -0,0 +1,51 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityCheckCaseBinding; +import com.casic.dcms.ui.fragment.check.CaseCheckFragment; +import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/16 9:24 + * @email : 290677893@qq.com + */ +public class CheckCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核查"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseCheckFragment()); + fragmentList.add(new CaseCheckedFragment()); + SubViewPagerAdapter adapter = new + SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.checkViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java new file mode 100644 index 0000000..5633eed --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java @@ -0,0 +1,45 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityVerifyCaseBinding; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +public class VerifyCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核实"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseVerifyFragment()); + fragmentList.add(new CaseVerifiedFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.verifyViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index aa89910..da3b461 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -15,15 +15,14 @@ import com.casic.dcms.databinding.FragmentHomeBinding; import com.casic.dcms.mvp.presenter.impl.GetHomePagePresenterImpl; import com.casic.dcms.mvp.presenter.impl.GetUserDataPresenterImpl; +import com.casic.dcms.mvp.view.IGetHomePageView; import com.casic.dcms.mvp.view.IGetUserDataView; -import com.casic.dcms.mvp.view.IHomePageView; import com.casic.dcms.ui.BridgeMaintainActivity; -import com.casic.dcms.ui.CaseCheckActivity; import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CheckCaseActivity; import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; @@ -36,6 +35,7 @@ import com.casic.dcms.ui.QuickCaseUploadActivity; import com.casic.dcms.ui.StreetlightManagerActivity; import com.casic.dcms.ui.UrgentCaseActivity; +import com.casic.dcms.ui.VerifyCaseActivity; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -44,7 +44,8 @@ import java.util.GregorianCalendar; -public class HomePageFragment extends AndroidxBaseFragment implements IGetUserDataView, IHomePageView { +public class HomePageFragment extends AndroidxBaseFragment + implements IGetUserDataView, IGetHomePageView { private Context context; private GetUserDataPresenterImpl userDataPresenter; @@ -127,10 +128,10 @@ intent.setClass(context, PackageCaseUploadActivity.class); break; case "案卷核实": - intent.setClass(context, CaseVerifyActivity.class); + intent.setClass(context, VerifyCaseActivity.class); break; case "案卷核查": - intent.setClass(context, CaseCheckActivity.class); + intent.setClass(context, CheckCaseActivity.class); break; case "案卷处理": intent.setClass(context, CaseHandleActivity.class); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 51947e9..a8ce821 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -16,7 +16,7 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckFragment"; private Context context; - private CaseCheckPresenterImpl caseCheckPresenter; + private CaseCheckPresenterImpl checkPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseCheckPresenter = new CaseCheckPresenterImpl(this); - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter = new CaseCheckPresenterImpl(this); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; - checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + checkFragment.checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex, false); } else if (msg.what == 202104251) { if (checkFragment.isRefresh || checkFragment.isLoadMore) { checkFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseCheckPresenter != null) { - caseCheckPresenter.disposeRetrofitRequest(); + if (checkPresenter != null) { + checkPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index f0feb0c..2dd96b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckedFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckedFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckedFragment"; private Context context; - private CaseCheckedPresenterImpl caseCheckedPresenter; + private CaseCheckPresenterImpl checkedPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; private List dataBeans = new ArrayList<>(); @@ -46,8 +46,8 @@ @Override protected void initData() { - caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter = new CaseCheckPresenterImpl(this); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -60,7 +60,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -68,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -98,7 +98,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); + checkedFragment.checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex, true); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,8 +127,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -152,8 +151,8 @@ @Override public void onDestroyView() { - if (caseCheckedPresenter != null) { - caseCheckedPresenter.disposeRetrofitRequest(); + if (checkedPresenter != null) { + checkedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index c77d0e8..1c2a266 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseVerifiedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseVerifiedFragment extends AndroidxBaseFragment implements ICaseVerifyView { +public class CaseVerifiedFragment extends AndroidxBaseFragment implements IVerifyCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; - private CaseVerifiedPresenterImpl caseVerifiedPresenter; + private VerifyCasePresenterImpl verifiedPresenter; private int pageIndex = 1; private CaseVerifyResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter = new VerifyCasePresenterImpl(this); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -101,7 +101,7 @@ verifiedFragment.isRefresh = true; //刷新之后页码重置 verifiedFragment.pageIndex = 1; - verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex); + verifiedFragment.verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex, true); } else if (msg.what == 202104254) { if (verifiedFragment.isRefresh || verifiedFragment.isLoadMore) { verifiedFragment.adapter.notifyDataSetChanged(); @@ -130,8 +130,7 @@ } @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -155,8 +154,8 @@ @Override public void onDestroyView() { - if (caseVerifiedPresenter != null) { - caseVerifiedPresenter.disposeRetrofitRequest(); + if (verifiedPresenter != null) { + verifiedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 6967e37..c097722 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.databinding.ActivityMapCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -54,11 +54,11 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; private ListenableList graphicsOverlays; @@ -94,7 +94,7 @@ viewBinding.mapView.setMap(arcGISMap); caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); + caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 @@ -219,7 +219,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核实数据 - caseVerifyPresenter.onReadyRetrofitRequest(1000, 1); + caseVerifyPresenter.onReadyRetrofitRequest(1000, 1, false); break; case 2: viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -227,7 +227,7 @@ viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核查数据 - caseCheckPresenter.onReadyRetrofitRequest(1000, 1); + caseCheckPresenter.onReadyRetrofitRequest(1000, 1, false); break; default: break; @@ -283,8 +283,7 @@ * 待核实 */ @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -314,8 +313,7 @@ * 待核查 */ @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java deleted file mode 100644 index 1e1a60c..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseVerifyBinding; -import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; -import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -public class CaseVerifyActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核实"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseVerifyFragment()); - fragmentList.add(new CaseVerifiedFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.verifyViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java new file mode 100644 index 0000000..e48ddad --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java @@ -0,0 +1,51 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityCheckCaseBinding; +import com.casic.dcms.ui.fragment.check.CaseCheckFragment; +import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/16 9:24 + * @email : 290677893@qq.com + */ +public class CheckCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核查"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseCheckFragment()); + fragmentList.add(new CaseCheckedFragment()); + SubViewPagerAdapter adapter = new + SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.checkViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java new file mode 100644 index 0000000..5633eed --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java @@ -0,0 +1,45 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityVerifyCaseBinding; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +public class VerifyCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核实"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseVerifyFragment()); + fragmentList.add(new CaseVerifiedFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.verifyViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index aa89910..da3b461 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -15,15 +15,14 @@ import com.casic.dcms.databinding.FragmentHomeBinding; import com.casic.dcms.mvp.presenter.impl.GetHomePagePresenterImpl; import com.casic.dcms.mvp.presenter.impl.GetUserDataPresenterImpl; +import com.casic.dcms.mvp.view.IGetHomePageView; import com.casic.dcms.mvp.view.IGetUserDataView; -import com.casic.dcms.mvp.view.IHomePageView; import com.casic.dcms.ui.BridgeMaintainActivity; -import com.casic.dcms.ui.CaseCheckActivity; import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CheckCaseActivity; import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; @@ -36,6 +35,7 @@ import com.casic.dcms.ui.QuickCaseUploadActivity; import com.casic.dcms.ui.StreetlightManagerActivity; import com.casic.dcms.ui.UrgentCaseActivity; +import com.casic.dcms.ui.VerifyCaseActivity; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -44,7 +44,8 @@ import java.util.GregorianCalendar; -public class HomePageFragment extends AndroidxBaseFragment implements IGetUserDataView, IHomePageView { +public class HomePageFragment extends AndroidxBaseFragment + implements IGetUserDataView, IGetHomePageView { private Context context; private GetUserDataPresenterImpl userDataPresenter; @@ -127,10 +128,10 @@ intent.setClass(context, PackageCaseUploadActivity.class); break; case "案卷核实": - intent.setClass(context, CaseVerifyActivity.class); + intent.setClass(context, VerifyCaseActivity.class); break; case "案卷核查": - intent.setClass(context, CaseCheckActivity.class); + intent.setClass(context, CheckCaseActivity.class); break; case "案卷处理": intent.setClass(context, CaseHandleActivity.class); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 51947e9..a8ce821 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -16,7 +16,7 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckFragment"; private Context context; - private CaseCheckPresenterImpl caseCheckPresenter; + private CaseCheckPresenterImpl checkPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseCheckPresenter = new CaseCheckPresenterImpl(this); - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter = new CaseCheckPresenterImpl(this); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; - checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + checkFragment.checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex, false); } else if (msg.what == 202104251) { if (checkFragment.isRefresh || checkFragment.isLoadMore) { checkFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseCheckPresenter != null) { - caseCheckPresenter.disposeRetrofitRequest(); + if (checkPresenter != null) { + checkPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index f0feb0c..2dd96b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckedFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckedFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckedFragment"; private Context context; - private CaseCheckedPresenterImpl caseCheckedPresenter; + private CaseCheckPresenterImpl checkedPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; private List dataBeans = new ArrayList<>(); @@ -46,8 +46,8 @@ @Override protected void initData() { - caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter = new CaseCheckPresenterImpl(this); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -60,7 +60,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -68,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -98,7 +98,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); + checkedFragment.checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex, true); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,8 +127,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -152,8 +151,8 @@ @Override public void onDestroyView() { - if (caseCheckedPresenter != null) { - caseCheckedPresenter.disposeRetrofitRequest(); + if (checkedPresenter != null) { + checkedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index c77d0e8..1c2a266 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseVerifiedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseVerifiedFragment extends AndroidxBaseFragment implements ICaseVerifyView { +public class CaseVerifiedFragment extends AndroidxBaseFragment implements IVerifyCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; - private CaseVerifiedPresenterImpl caseVerifiedPresenter; + private VerifyCasePresenterImpl verifiedPresenter; private int pageIndex = 1; private CaseVerifyResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter = new VerifyCasePresenterImpl(this); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -101,7 +101,7 @@ verifiedFragment.isRefresh = true; //刷新之后页码重置 verifiedFragment.pageIndex = 1; - verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex); + verifiedFragment.verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex, true); } else if (msg.what == 202104254) { if (verifiedFragment.isRefresh || verifiedFragment.isLoadMore) { verifiedFragment.adapter.notifyDataSetChanged(); @@ -130,8 +130,7 @@ } @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -155,8 +154,8 @@ @Override public void onDestroyView() { - if (caseVerifiedPresenter != null) { - caseVerifiedPresenter.disposeRetrofitRequest(); + if (verifiedPresenter != null) { + verifiedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 8676d4d..7cf9448 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.ui.CaseVerifyDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseVerifyFragment extends AndroidxBaseFragment implements ICaseVerifyView { +public class CaseVerifyFragment extends AndroidxBaseFragment implements IVerifyCaseView { private static final String TAG = "CaseVerifyFragment"; private Context context; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl verifyPresenter; private int pageIndex = 1; private CaseVerifyResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter = new VerifyCasePresenterImpl(this); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ verifyFragment.isRefresh = true; //刷新之后页码重置 verifyFragment.pageIndex = 1; - verifyFragment.caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex); + verifyFragment.verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex, false); } else if (msg.what == 202104253) { if (verifyFragment.isRefresh || verifyFragment.isLoadMore) { verifyFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { + public void obtainVerifyResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseVerifyPresenter != null) { - caseVerifyPresenter.disposeRetrofitRequest(); + if (verifyPresenter != null) { + verifyPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 6967e37..c097722 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.databinding.ActivityMapCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -54,11 +54,11 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; private ListenableList graphicsOverlays; @@ -94,7 +94,7 @@ viewBinding.mapView.setMap(arcGISMap); caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); + caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 @@ -219,7 +219,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核实数据 - caseVerifyPresenter.onReadyRetrofitRequest(1000, 1); + caseVerifyPresenter.onReadyRetrofitRequest(1000, 1, false); break; case 2: viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -227,7 +227,7 @@ viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核查数据 - caseCheckPresenter.onReadyRetrofitRequest(1000, 1); + caseCheckPresenter.onReadyRetrofitRequest(1000, 1, false); break; default: break; @@ -283,8 +283,7 @@ * 待核实 */ @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -314,8 +313,7 @@ * 待核查 */ @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java deleted file mode 100644 index 1e1a60c..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseVerifyBinding; -import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; -import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -public class CaseVerifyActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核实"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseVerifyFragment()); - fragmentList.add(new CaseVerifiedFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.verifyViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java new file mode 100644 index 0000000..e48ddad --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java @@ -0,0 +1,51 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityCheckCaseBinding; +import com.casic.dcms.ui.fragment.check.CaseCheckFragment; +import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/16 9:24 + * @email : 290677893@qq.com + */ +public class CheckCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核查"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseCheckFragment()); + fragmentList.add(new CaseCheckedFragment()); + SubViewPagerAdapter adapter = new + SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.checkViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java new file mode 100644 index 0000000..5633eed --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java @@ -0,0 +1,45 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityVerifyCaseBinding; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +public class VerifyCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核实"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseVerifyFragment()); + fragmentList.add(new CaseVerifiedFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.verifyViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index aa89910..da3b461 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -15,15 +15,14 @@ import com.casic.dcms.databinding.FragmentHomeBinding; import com.casic.dcms.mvp.presenter.impl.GetHomePagePresenterImpl; import com.casic.dcms.mvp.presenter.impl.GetUserDataPresenterImpl; +import com.casic.dcms.mvp.view.IGetHomePageView; import com.casic.dcms.mvp.view.IGetUserDataView; -import com.casic.dcms.mvp.view.IHomePageView; import com.casic.dcms.ui.BridgeMaintainActivity; -import com.casic.dcms.ui.CaseCheckActivity; import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CheckCaseActivity; import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; @@ -36,6 +35,7 @@ import com.casic.dcms.ui.QuickCaseUploadActivity; import com.casic.dcms.ui.StreetlightManagerActivity; import com.casic.dcms.ui.UrgentCaseActivity; +import com.casic.dcms.ui.VerifyCaseActivity; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -44,7 +44,8 @@ import java.util.GregorianCalendar; -public class HomePageFragment extends AndroidxBaseFragment implements IGetUserDataView, IHomePageView { +public class HomePageFragment extends AndroidxBaseFragment + implements IGetUserDataView, IGetHomePageView { private Context context; private GetUserDataPresenterImpl userDataPresenter; @@ -127,10 +128,10 @@ intent.setClass(context, PackageCaseUploadActivity.class); break; case "案卷核实": - intent.setClass(context, CaseVerifyActivity.class); + intent.setClass(context, VerifyCaseActivity.class); break; case "案卷核查": - intent.setClass(context, CaseCheckActivity.class); + intent.setClass(context, CheckCaseActivity.class); break; case "案卷处理": intent.setClass(context, CaseHandleActivity.class); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 51947e9..a8ce821 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -16,7 +16,7 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckFragment"; private Context context; - private CaseCheckPresenterImpl caseCheckPresenter; + private CaseCheckPresenterImpl checkPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseCheckPresenter = new CaseCheckPresenterImpl(this); - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter = new CaseCheckPresenterImpl(this); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; - checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + checkFragment.checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex, false); } else if (msg.what == 202104251) { if (checkFragment.isRefresh || checkFragment.isLoadMore) { checkFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseCheckPresenter != null) { - caseCheckPresenter.disposeRetrofitRequest(); + if (checkPresenter != null) { + checkPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index f0feb0c..2dd96b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckedFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckedFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckedFragment"; private Context context; - private CaseCheckedPresenterImpl caseCheckedPresenter; + private CaseCheckPresenterImpl checkedPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; private List dataBeans = new ArrayList<>(); @@ -46,8 +46,8 @@ @Override protected void initData() { - caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter = new CaseCheckPresenterImpl(this); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -60,7 +60,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -68,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -98,7 +98,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); + checkedFragment.checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex, true); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,8 +127,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -152,8 +151,8 @@ @Override public void onDestroyView() { - if (caseCheckedPresenter != null) { - caseCheckedPresenter.disposeRetrofitRequest(); + if (checkedPresenter != null) { + checkedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index c77d0e8..1c2a266 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseVerifiedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseVerifiedFragment extends AndroidxBaseFragment implements ICaseVerifyView { +public class CaseVerifiedFragment extends AndroidxBaseFragment implements IVerifyCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; - private CaseVerifiedPresenterImpl caseVerifiedPresenter; + private VerifyCasePresenterImpl verifiedPresenter; private int pageIndex = 1; private CaseVerifyResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter = new VerifyCasePresenterImpl(this); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -101,7 +101,7 @@ verifiedFragment.isRefresh = true; //刷新之后页码重置 verifiedFragment.pageIndex = 1; - verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex); + verifiedFragment.verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex, true); } else if (msg.what == 202104254) { if (verifiedFragment.isRefresh || verifiedFragment.isLoadMore) { verifiedFragment.adapter.notifyDataSetChanged(); @@ -130,8 +130,7 @@ } @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -155,8 +154,8 @@ @Override public void onDestroyView() { - if (caseVerifiedPresenter != null) { - caseVerifiedPresenter.disposeRetrofitRequest(); + if (verifiedPresenter != null) { + verifiedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 8676d4d..7cf9448 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.ui.CaseVerifyDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseVerifyFragment extends AndroidxBaseFragment implements ICaseVerifyView { +public class CaseVerifyFragment extends AndroidxBaseFragment implements IVerifyCaseView { private static final String TAG = "CaseVerifyFragment"; private Context context; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl verifyPresenter; private int pageIndex = 1; private CaseVerifyResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter = new VerifyCasePresenterImpl(this); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ verifyFragment.isRefresh = true; //刷新之后页码重置 verifyFragment.pageIndex = 1; - verifyFragment.caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex); + verifyFragment.verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex, false); } else if (msg.what == 202104253) { if (verifyFragment.isRefresh || verifyFragment.isLoadMore) { verifyFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { + public void obtainVerifyResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseVerifyPresenter != null) { - caseVerifyPresenter.disposeRetrofitRequest(); + if (verifyPresenter != null) { + verifyPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } 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 53dc6b0..d0eceb3 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 @@ -252,33 +252,33 @@ * 获取核实待办案卷 */ @POST("/case/toVerifyListPage") - Observable obtainCaseVerifyList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getVerifyResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核实已办案卷 */ @POST("/case/verifiedListPage") - Observable obtainCaseVerifiedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getVerifiedResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核查待办案卷 */ @POST("/case/toCheckListPage") - Observable obtainCaseCheckList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getCheckResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核查已办案卷 */ @POST("/case/checkedListPage") - Observable obtainCaseCheckedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getCheckedResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 上传案卷图片 diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 6967e37..c097722 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.databinding.ActivityMapCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -54,11 +54,11 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; private ListenableList graphicsOverlays; @@ -94,7 +94,7 @@ viewBinding.mapView.setMap(arcGISMap); caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); + caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 @@ -219,7 +219,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核实数据 - caseVerifyPresenter.onReadyRetrofitRequest(1000, 1); + caseVerifyPresenter.onReadyRetrofitRequest(1000, 1, false); break; case 2: viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -227,7 +227,7 @@ viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核查数据 - caseCheckPresenter.onReadyRetrofitRequest(1000, 1); + caseCheckPresenter.onReadyRetrofitRequest(1000, 1, false); break; default: break; @@ -283,8 +283,7 @@ * 待核实 */ @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -314,8 +313,7 @@ * 待核查 */ @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java deleted file mode 100644 index 1e1a60c..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseVerifyBinding; -import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; -import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -public class CaseVerifyActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核实"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseVerifyFragment()); - fragmentList.add(new CaseVerifiedFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.verifyViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java new file mode 100644 index 0000000..e48ddad --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java @@ -0,0 +1,51 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityCheckCaseBinding; +import com.casic.dcms.ui.fragment.check.CaseCheckFragment; +import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/16 9:24 + * @email : 290677893@qq.com + */ +public class CheckCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核查"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseCheckFragment()); + fragmentList.add(new CaseCheckedFragment()); + SubViewPagerAdapter adapter = new + SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.checkViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java new file mode 100644 index 0000000..5633eed --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java @@ -0,0 +1,45 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityVerifyCaseBinding; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +public class VerifyCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核实"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseVerifyFragment()); + fragmentList.add(new CaseVerifiedFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.verifyViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index aa89910..da3b461 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -15,15 +15,14 @@ import com.casic.dcms.databinding.FragmentHomeBinding; import com.casic.dcms.mvp.presenter.impl.GetHomePagePresenterImpl; import com.casic.dcms.mvp.presenter.impl.GetUserDataPresenterImpl; +import com.casic.dcms.mvp.view.IGetHomePageView; import com.casic.dcms.mvp.view.IGetUserDataView; -import com.casic.dcms.mvp.view.IHomePageView; import com.casic.dcms.ui.BridgeMaintainActivity; -import com.casic.dcms.ui.CaseCheckActivity; import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CheckCaseActivity; import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; @@ -36,6 +35,7 @@ import com.casic.dcms.ui.QuickCaseUploadActivity; import com.casic.dcms.ui.StreetlightManagerActivity; import com.casic.dcms.ui.UrgentCaseActivity; +import com.casic.dcms.ui.VerifyCaseActivity; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -44,7 +44,8 @@ import java.util.GregorianCalendar; -public class HomePageFragment extends AndroidxBaseFragment implements IGetUserDataView, IHomePageView { +public class HomePageFragment extends AndroidxBaseFragment + implements IGetUserDataView, IGetHomePageView { private Context context; private GetUserDataPresenterImpl userDataPresenter; @@ -127,10 +128,10 @@ intent.setClass(context, PackageCaseUploadActivity.class); break; case "案卷核实": - intent.setClass(context, CaseVerifyActivity.class); + intent.setClass(context, VerifyCaseActivity.class); break; case "案卷核查": - intent.setClass(context, CaseCheckActivity.class); + intent.setClass(context, CheckCaseActivity.class); break; case "案卷处理": intent.setClass(context, CaseHandleActivity.class); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 51947e9..a8ce821 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -16,7 +16,7 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckFragment"; private Context context; - private CaseCheckPresenterImpl caseCheckPresenter; + private CaseCheckPresenterImpl checkPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseCheckPresenter = new CaseCheckPresenterImpl(this); - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter = new CaseCheckPresenterImpl(this); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; - checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + checkFragment.checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex, false); } else if (msg.what == 202104251) { if (checkFragment.isRefresh || checkFragment.isLoadMore) { checkFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseCheckPresenter != null) { - caseCheckPresenter.disposeRetrofitRequest(); + if (checkPresenter != null) { + checkPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index f0feb0c..2dd96b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckedFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckedFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckedFragment"; private Context context; - private CaseCheckedPresenterImpl caseCheckedPresenter; + private CaseCheckPresenterImpl checkedPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; private List dataBeans = new ArrayList<>(); @@ -46,8 +46,8 @@ @Override protected void initData() { - caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter = new CaseCheckPresenterImpl(this); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -60,7 +60,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -68,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -98,7 +98,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); + checkedFragment.checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex, true); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,8 +127,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -152,8 +151,8 @@ @Override public void onDestroyView() { - if (caseCheckedPresenter != null) { - caseCheckedPresenter.disposeRetrofitRequest(); + if (checkedPresenter != null) { + checkedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index c77d0e8..1c2a266 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseVerifiedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseVerifiedFragment extends AndroidxBaseFragment implements ICaseVerifyView { +public class CaseVerifiedFragment extends AndroidxBaseFragment implements IVerifyCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; - private CaseVerifiedPresenterImpl caseVerifiedPresenter; + private VerifyCasePresenterImpl verifiedPresenter; private int pageIndex = 1; private CaseVerifyResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter = new VerifyCasePresenterImpl(this); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -101,7 +101,7 @@ verifiedFragment.isRefresh = true; //刷新之后页码重置 verifiedFragment.pageIndex = 1; - verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex); + verifiedFragment.verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex, true); } else if (msg.what == 202104254) { if (verifiedFragment.isRefresh || verifiedFragment.isLoadMore) { verifiedFragment.adapter.notifyDataSetChanged(); @@ -130,8 +130,7 @@ } @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -155,8 +154,8 @@ @Override public void onDestroyView() { - if (caseVerifiedPresenter != null) { - caseVerifiedPresenter.disposeRetrofitRequest(); + if (verifiedPresenter != null) { + verifiedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 8676d4d..7cf9448 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.ui.CaseVerifyDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseVerifyFragment extends AndroidxBaseFragment implements ICaseVerifyView { +public class CaseVerifyFragment extends AndroidxBaseFragment implements IVerifyCaseView { private static final String TAG = "CaseVerifyFragment"; private Context context; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl verifyPresenter; private int pageIndex = 1; private CaseVerifyResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter = new VerifyCasePresenterImpl(this); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ verifyFragment.isRefresh = true; //刷新之后页码重置 verifyFragment.pageIndex = 1; - verifyFragment.caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex); + verifyFragment.verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex, false); } else if (msg.what == 202104253) { if (verifyFragment.isRefresh || verifyFragment.isLoadMore) { verifyFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { + public void obtainVerifyResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseVerifyPresenter != null) { - caseVerifyPresenter.disposeRetrofitRequest(); + if (verifyPresenter != null) { + verifyPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } 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 53dc6b0..d0eceb3 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 @@ -252,33 +252,33 @@ * 获取核实待办案卷 */ @POST("/case/toVerifyListPage") - Observable obtainCaseVerifyList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getVerifyResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核实已办案卷 */ @POST("/case/verifiedListPage") - Observable obtainCaseVerifiedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getVerifiedResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核查待办案卷 */ @POST("/case/toCheckListPage") - Observable obtainCaseCheckList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getCheckResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核查已办案卷 */ @POST("/case/checkedListPage") - Observable obtainCaseCheckedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getCheckedResult(@Header("token") String token, + @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 1e2279a..fe9d123 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 @@ -273,37 +273,37 @@ /** * 获取核实待办案卷 */ - public static Observable getCaseVerifyListResult(int limit, int offset) { + public static Observable getVerifyResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseVerifyList(AuthenticationHelper.getToken(), limit, offset); + return service.getVerifyResult(AuthenticationHelper.getToken(), limit, offset); } /** * 获取核实已办案卷 */ - public static Observable getCaseVerifiedListResult(int limit, int offset) { + public static Observable getVerifiedResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseVerifiedList(AuthenticationHelper.getToken(), limit, offset); + return service.getVerifiedResult(AuthenticationHelper.getToken(), limit, offset); } /** * 获取核查待办案卷 */ - public static Observable getCaseCheckListResult(int limit, int offset) { + public static Observable getCheckResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseCheckList(AuthenticationHelper.getToken(), limit, offset); + return service.getCheckResult(AuthenticationHelper.getToken(), limit, offset); } /** * 获取核查已办案卷 */ - public static Observable getCaseCheckedListResult(int limit, int offset) { + public static Observable getCheckedResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseCheckedList(AuthenticationHelper.getToken(), limit, offset); + return service.getCheckedResult(AuthenticationHelper.getToken(), limit, offset); } /** diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 6967e37..c097722 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.databinding.ActivityMapCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -54,11 +54,11 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; private ListenableList graphicsOverlays; @@ -94,7 +94,7 @@ viewBinding.mapView.setMap(arcGISMap); caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); + caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 @@ -219,7 +219,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核实数据 - caseVerifyPresenter.onReadyRetrofitRequest(1000, 1); + caseVerifyPresenter.onReadyRetrofitRequest(1000, 1, false); break; case 2: viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -227,7 +227,7 @@ viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核查数据 - caseCheckPresenter.onReadyRetrofitRequest(1000, 1); + caseCheckPresenter.onReadyRetrofitRequest(1000, 1, false); break; default: break; @@ -283,8 +283,7 @@ * 待核实 */ @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -314,8 +313,7 @@ * 待核查 */ @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java deleted file mode 100644 index 1e1a60c..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseVerifyBinding; -import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; -import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -public class CaseVerifyActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核实"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseVerifyFragment()); - fragmentList.add(new CaseVerifiedFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.verifyViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java new file mode 100644 index 0000000..e48ddad --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java @@ -0,0 +1,51 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityCheckCaseBinding; +import com.casic.dcms.ui.fragment.check.CaseCheckFragment; +import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/16 9:24 + * @email : 290677893@qq.com + */ +public class CheckCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核查"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseCheckFragment()); + fragmentList.add(new CaseCheckedFragment()); + SubViewPagerAdapter adapter = new + SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.checkViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java new file mode 100644 index 0000000..5633eed --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java @@ -0,0 +1,45 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityVerifyCaseBinding; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +public class VerifyCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核实"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseVerifyFragment()); + fragmentList.add(new CaseVerifiedFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.verifyViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index aa89910..da3b461 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -15,15 +15,14 @@ import com.casic.dcms.databinding.FragmentHomeBinding; import com.casic.dcms.mvp.presenter.impl.GetHomePagePresenterImpl; import com.casic.dcms.mvp.presenter.impl.GetUserDataPresenterImpl; +import com.casic.dcms.mvp.view.IGetHomePageView; import com.casic.dcms.mvp.view.IGetUserDataView; -import com.casic.dcms.mvp.view.IHomePageView; import com.casic.dcms.ui.BridgeMaintainActivity; -import com.casic.dcms.ui.CaseCheckActivity; import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CheckCaseActivity; import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; @@ -36,6 +35,7 @@ import com.casic.dcms.ui.QuickCaseUploadActivity; import com.casic.dcms.ui.StreetlightManagerActivity; import com.casic.dcms.ui.UrgentCaseActivity; +import com.casic.dcms.ui.VerifyCaseActivity; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -44,7 +44,8 @@ import java.util.GregorianCalendar; -public class HomePageFragment extends AndroidxBaseFragment implements IGetUserDataView, IHomePageView { +public class HomePageFragment extends AndroidxBaseFragment + implements IGetUserDataView, IGetHomePageView { private Context context; private GetUserDataPresenterImpl userDataPresenter; @@ -127,10 +128,10 @@ intent.setClass(context, PackageCaseUploadActivity.class); break; case "案卷核实": - intent.setClass(context, CaseVerifyActivity.class); + intent.setClass(context, VerifyCaseActivity.class); break; case "案卷核查": - intent.setClass(context, CaseCheckActivity.class); + intent.setClass(context, CheckCaseActivity.class); break; case "案卷处理": intent.setClass(context, CaseHandleActivity.class); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 51947e9..a8ce821 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -16,7 +16,7 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckFragment"; private Context context; - private CaseCheckPresenterImpl caseCheckPresenter; + private CaseCheckPresenterImpl checkPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseCheckPresenter = new CaseCheckPresenterImpl(this); - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter = new CaseCheckPresenterImpl(this); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; - checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + checkFragment.checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex, false); } else if (msg.what == 202104251) { if (checkFragment.isRefresh || checkFragment.isLoadMore) { checkFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseCheckPresenter != null) { - caseCheckPresenter.disposeRetrofitRequest(); + if (checkPresenter != null) { + checkPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index f0feb0c..2dd96b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckedFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckedFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckedFragment"; private Context context; - private CaseCheckedPresenterImpl caseCheckedPresenter; + private CaseCheckPresenterImpl checkedPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; private List dataBeans = new ArrayList<>(); @@ -46,8 +46,8 @@ @Override protected void initData() { - caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter = new CaseCheckPresenterImpl(this); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -60,7 +60,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -68,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -98,7 +98,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); + checkedFragment.checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex, true); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,8 +127,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -152,8 +151,8 @@ @Override public void onDestroyView() { - if (caseCheckedPresenter != null) { - caseCheckedPresenter.disposeRetrofitRequest(); + if (checkedPresenter != null) { + checkedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index c77d0e8..1c2a266 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseVerifiedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseVerifiedFragment extends AndroidxBaseFragment implements ICaseVerifyView { +public class CaseVerifiedFragment extends AndroidxBaseFragment implements IVerifyCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; - private CaseVerifiedPresenterImpl caseVerifiedPresenter; + private VerifyCasePresenterImpl verifiedPresenter; private int pageIndex = 1; private CaseVerifyResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter = new VerifyCasePresenterImpl(this); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -101,7 +101,7 @@ verifiedFragment.isRefresh = true; //刷新之后页码重置 verifiedFragment.pageIndex = 1; - verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex); + verifiedFragment.verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex, true); } else if (msg.what == 202104254) { if (verifiedFragment.isRefresh || verifiedFragment.isLoadMore) { verifiedFragment.adapter.notifyDataSetChanged(); @@ -130,8 +130,7 @@ } @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -155,8 +154,8 @@ @Override public void onDestroyView() { - if (caseVerifiedPresenter != null) { - caseVerifiedPresenter.disposeRetrofitRequest(); + if (verifiedPresenter != null) { + verifiedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 8676d4d..7cf9448 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.ui.CaseVerifyDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseVerifyFragment extends AndroidxBaseFragment implements ICaseVerifyView { +public class CaseVerifyFragment extends AndroidxBaseFragment implements IVerifyCaseView { private static final String TAG = "CaseVerifyFragment"; private Context context; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl verifyPresenter; private int pageIndex = 1; private CaseVerifyResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter = new VerifyCasePresenterImpl(this); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ verifyFragment.isRefresh = true; //刷新之后页码重置 verifyFragment.pageIndex = 1; - verifyFragment.caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex); + verifyFragment.verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex, false); } else if (msg.what == 202104253) { if (verifyFragment.isRefresh || verifyFragment.isLoadMore) { verifyFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { + public void obtainVerifyResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseVerifyPresenter != null) { - caseVerifyPresenter.disposeRetrofitRequest(); + if (verifyPresenter != null) { + verifyPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } 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 53dc6b0..d0eceb3 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 @@ -252,33 +252,33 @@ * 获取核实待办案卷 */ @POST("/case/toVerifyListPage") - Observable obtainCaseVerifyList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getVerifyResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核实已办案卷 */ @POST("/case/verifiedListPage") - Observable obtainCaseVerifiedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getVerifiedResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核查待办案卷 */ @POST("/case/toCheckListPage") - Observable obtainCaseCheckList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getCheckResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核查已办案卷 */ @POST("/case/checkedListPage") - Observable obtainCaseCheckedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getCheckedResult(@Header("token") String token, + @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 1e2279a..fe9d123 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 @@ -273,37 +273,37 @@ /** * 获取核实待办案卷 */ - public static Observable getCaseVerifyListResult(int limit, int offset) { + public static Observable getVerifyResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseVerifyList(AuthenticationHelper.getToken(), limit, offset); + return service.getVerifyResult(AuthenticationHelper.getToken(), limit, offset); } /** * 获取核实已办案卷 */ - public static Observable getCaseVerifiedListResult(int limit, int offset) { + public static Observable getVerifiedResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseVerifiedList(AuthenticationHelper.getToken(), limit, offset); + return service.getVerifiedResult(AuthenticationHelper.getToken(), limit, offset); } /** * 获取核查待办案卷 */ - public static Observable getCaseCheckListResult(int limit, int offset) { + public static Observable getCheckResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseCheckList(AuthenticationHelper.getToken(), limit, offset); + return service.getCheckResult(AuthenticationHelper.getToken(), limit, offset); } /** * 获取核查已办案卷 */ - public static Observable getCaseCheckedListResult(int limit, int offset) { + public static Observable getCheckedResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseCheckedList(AuthenticationHelper.getToken(), limit, offset); + return service.getCheckedResult(AuthenticationHelper.getToken(), limit, offset); } /** diff --git a/app/src/main/res/layout/activity_case_check.xml b/app/src/main/res/layout/activity_case_check.xml deleted file mode 100644 index 274469e..0000000 --- a/app/src/main/res/layout/activity_case_check.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 6967e37..c097722 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.databinding.ActivityMapCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -54,11 +54,11 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; private ListenableList graphicsOverlays; @@ -94,7 +94,7 @@ viewBinding.mapView.setMap(arcGISMap); caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); + caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 @@ -219,7 +219,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核实数据 - caseVerifyPresenter.onReadyRetrofitRequest(1000, 1); + caseVerifyPresenter.onReadyRetrofitRequest(1000, 1, false); break; case 2: viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -227,7 +227,7 @@ viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核查数据 - caseCheckPresenter.onReadyRetrofitRequest(1000, 1); + caseCheckPresenter.onReadyRetrofitRequest(1000, 1, false); break; default: break; @@ -283,8 +283,7 @@ * 待核实 */ @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -314,8 +313,7 @@ * 待核查 */ @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java deleted file mode 100644 index 1e1a60c..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseVerifyBinding; -import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; -import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -public class CaseVerifyActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核实"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseVerifyFragment()); - fragmentList.add(new CaseVerifiedFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.verifyViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java new file mode 100644 index 0000000..e48ddad --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java @@ -0,0 +1,51 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityCheckCaseBinding; +import com.casic.dcms.ui.fragment.check.CaseCheckFragment; +import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/16 9:24 + * @email : 290677893@qq.com + */ +public class CheckCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核查"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseCheckFragment()); + fragmentList.add(new CaseCheckedFragment()); + SubViewPagerAdapter adapter = new + SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.checkViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java new file mode 100644 index 0000000..5633eed --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java @@ -0,0 +1,45 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityVerifyCaseBinding; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +public class VerifyCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核实"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseVerifyFragment()); + fragmentList.add(new CaseVerifiedFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.verifyViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index aa89910..da3b461 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -15,15 +15,14 @@ import com.casic.dcms.databinding.FragmentHomeBinding; import com.casic.dcms.mvp.presenter.impl.GetHomePagePresenterImpl; import com.casic.dcms.mvp.presenter.impl.GetUserDataPresenterImpl; +import com.casic.dcms.mvp.view.IGetHomePageView; import com.casic.dcms.mvp.view.IGetUserDataView; -import com.casic.dcms.mvp.view.IHomePageView; import com.casic.dcms.ui.BridgeMaintainActivity; -import com.casic.dcms.ui.CaseCheckActivity; import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CheckCaseActivity; import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; @@ -36,6 +35,7 @@ import com.casic.dcms.ui.QuickCaseUploadActivity; import com.casic.dcms.ui.StreetlightManagerActivity; import com.casic.dcms.ui.UrgentCaseActivity; +import com.casic.dcms.ui.VerifyCaseActivity; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -44,7 +44,8 @@ import java.util.GregorianCalendar; -public class HomePageFragment extends AndroidxBaseFragment implements IGetUserDataView, IHomePageView { +public class HomePageFragment extends AndroidxBaseFragment + implements IGetUserDataView, IGetHomePageView { private Context context; private GetUserDataPresenterImpl userDataPresenter; @@ -127,10 +128,10 @@ intent.setClass(context, PackageCaseUploadActivity.class); break; case "案卷核实": - intent.setClass(context, CaseVerifyActivity.class); + intent.setClass(context, VerifyCaseActivity.class); break; case "案卷核查": - intent.setClass(context, CaseCheckActivity.class); + intent.setClass(context, CheckCaseActivity.class); break; case "案卷处理": intent.setClass(context, CaseHandleActivity.class); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 51947e9..a8ce821 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -16,7 +16,7 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckFragment"; private Context context; - private CaseCheckPresenterImpl caseCheckPresenter; + private CaseCheckPresenterImpl checkPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseCheckPresenter = new CaseCheckPresenterImpl(this); - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter = new CaseCheckPresenterImpl(this); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; - checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + checkFragment.checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex, false); } else if (msg.what == 202104251) { if (checkFragment.isRefresh || checkFragment.isLoadMore) { checkFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseCheckPresenter != null) { - caseCheckPresenter.disposeRetrofitRequest(); + if (checkPresenter != null) { + checkPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index f0feb0c..2dd96b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckedFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckedFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckedFragment"; private Context context; - private CaseCheckedPresenterImpl caseCheckedPresenter; + private CaseCheckPresenterImpl checkedPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; private List dataBeans = new ArrayList<>(); @@ -46,8 +46,8 @@ @Override protected void initData() { - caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter = new CaseCheckPresenterImpl(this); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -60,7 +60,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -68,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -98,7 +98,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); + checkedFragment.checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex, true); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,8 +127,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -152,8 +151,8 @@ @Override public void onDestroyView() { - if (caseCheckedPresenter != null) { - caseCheckedPresenter.disposeRetrofitRequest(); + if (checkedPresenter != null) { + checkedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index c77d0e8..1c2a266 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseVerifiedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseVerifiedFragment extends AndroidxBaseFragment implements ICaseVerifyView { +public class CaseVerifiedFragment extends AndroidxBaseFragment implements IVerifyCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; - private CaseVerifiedPresenterImpl caseVerifiedPresenter; + private VerifyCasePresenterImpl verifiedPresenter; private int pageIndex = 1; private CaseVerifyResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter = new VerifyCasePresenterImpl(this); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -101,7 +101,7 @@ verifiedFragment.isRefresh = true; //刷新之后页码重置 verifiedFragment.pageIndex = 1; - verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex); + verifiedFragment.verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex, true); } else if (msg.what == 202104254) { if (verifiedFragment.isRefresh || verifiedFragment.isLoadMore) { verifiedFragment.adapter.notifyDataSetChanged(); @@ -130,8 +130,7 @@ } @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -155,8 +154,8 @@ @Override public void onDestroyView() { - if (caseVerifiedPresenter != null) { - caseVerifiedPresenter.disposeRetrofitRequest(); + if (verifiedPresenter != null) { + verifiedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 8676d4d..7cf9448 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.ui.CaseVerifyDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseVerifyFragment extends AndroidxBaseFragment implements ICaseVerifyView { +public class CaseVerifyFragment extends AndroidxBaseFragment implements IVerifyCaseView { private static final String TAG = "CaseVerifyFragment"; private Context context; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl verifyPresenter; private int pageIndex = 1; private CaseVerifyResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter = new VerifyCasePresenterImpl(this); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ verifyFragment.isRefresh = true; //刷新之后页码重置 verifyFragment.pageIndex = 1; - verifyFragment.caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex); + verifyFragment.verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex, false); } else if (msg.what == 202104253) { if (verifyFragment.isRefresh || verifyFragment.isLoadMore) { verifyFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { + public void obtainVerifyResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseVerifyPresenter != null) { - caseVerifyPresenter.disposeRetrofitRequest(); + if (verifyPresenter != null) { + verifyPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } 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 53dc6b0..d0eceb3 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 @@ -252,33 +252,33 @@ * 获取核实待办案卷 */ @POST("/case/toVerifyListPage") - Observable obtainCaseVerifyList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getVerifyResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核实已办案卷 */ @POST("/case/verifiedListPage") - Observable obtainCaseVerifiedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getVerifiedResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核查待办案卷 */ @POST("/case/toCheckListPage") - Observable obtainCaseCheckList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getCheckResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核查已办案卷 */ @POST("/case/checkedListPage") - Observable obtainCaseCheckedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getCheckedResult(@Header("token") String token, + @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 1e2279a..fe9d123 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 @@ -273,37 +273,37 @@ /** * 获取核实待办案卷 */ - public static Observable getCaseVerifyListResult(int limit, int offset) { + public static Observable getVerifyResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseVerifyList(AuthenticationHelper.getToken(), limit, offset); + return service.getVerifyResult(AuthenticationHelper.getToken(), limit, offset); } /** * 获取核实已办案卷 */ - public static Observable getCaseVerifiedListResult(int limit, int offset) { + public static Observable getVerifiedResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseVerifiedList(AuthenticationHelper.getToken(), limit, offset); + return service.getVerifiedResult(AuthenticationHelper.getToken(), limit, offset); } /** * 获取核查待办案卷 */ - public static Observable getCaseCheckListResult(int limit, int offset) { + public static Observable getCheckResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseCheckList(AuthenticationHelper.getToken(), limit, offset); + return service.getCheckResult(AuthenticationHelper.getToken(), limit, offset); } /** * 获取核查已办案卷 */ - public static Observable getCaseCheckedListResult(int limit, int offset) { + public static Observable getCheckedResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseCheckedList(AuthenticationHelper.getToken(), limit, offset); + return service.getCheckedResult(AuthenticationHelper.getToken(), limit, offset); } /** diff --git a/app/src/main/res/layout/activity_case_check.xml b/app/src/main/res/layout/activity_case_check.xml deleted file mode 100644 index 274469e..0000000 --- a/app/src/main/res/layout/activity_case_check.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml deleted file mode 100644 index 764678e..0000000 --- a/app/src/main/res/layout/activity_case_verify.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 6967e37..c097722 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.databinding.ActivityMapCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -54,11 +54,11 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; private ListenableList graphicsOverlays; @@ -94,7 +94,7 @@ viewBinding.mapView.setMap(arcGISMap); caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); + caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 @@ -219,7 +219,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核实数据 - caseVerifyPresenter.onReadyRetrofitRequest(1000, 1); + caseVerifyPresenter.onReadyRetrofitRequest(1000, 1, false); break; case 2: viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -227,7 +227,7 @@ viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核查数据 - caseCheckPresenter.onReadyRetrofitRequest(1000, 1); + caseCheckPresenter.onReadyRetrofitRequest(1000, 1, false); break; default: break; @@ -283,8 +283,7 @@ * 待核实 */ @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -314,8 +313,7 @@ * 待核查 */ @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java deleted file mode 100644 index 1e1a60c..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseVerifyBinding; -import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; -import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -public class CaseVerifyActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核实"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseVerifyFragment()); - fragmentList.add(new CaseVerifiedFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.verifyViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java new file mode 100644 index 0000000..e48ddad --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java @@ -0,0 +1,51 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityCheckCaseBinding; +import com.casic.dcms.ui.fragment.check.CaseCheckFragment; +import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/16 9:24 + * @email : 290677893@qq.com + */ +public class CheckCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核查"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseCheckFragment()); + fragmentList.add(new CaseCheckedFragment()); + SubViewPagerAdapter adapter = new + SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.checkViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java new file mode 100644 index 0000000..5633eed --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java @@ -0,0 +1,45 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityVerifyCaseBinding; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +public class VerifyCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核实"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseVerifyFragment()); + fragmentList.add(new CaseVerifiedFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.verifyViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index aa89910..da3b461 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -15,15 +15,14 @@ import com.casic.dcms.databinding.FragmentHomeBinding; import com.casic.dcms.mvp.presenter.impl.GetHomePagePresenterImpl; import com.casic.dcms.mvp.presenter.impl.GetUserDataPresenterImpl; +import com.casic.dcms.mvp.view.IGetHomePageView; import com.casic.dcms.mvp.view.IGetUserDataView; -import com.casic.dcms.mvp.view.IHomePageView; import com.casic.dcms.ui.BridgeMaintainActivity; -import com.casic.dcms.ui.CaseCheckActivity; import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CheckCaseActivity; import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; @@ -36,6 +35,7 @@ import com.casic.dcms.ui.QuickCaseUploadActivity; import com.casic.dcms.ui.StreetlightManagerActivity; import com.casic.dcms.ui.UrgentCaseActivity; +import com.casic.dcms.ui.VerifyCaseActivity; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -44,7 +44,8 @@ import java.util.GregorianCalendar; -public class HomePageFragment extends AndroidxBaseFragment implements IGetUserDataView, IHomePageView { +public class HomePageFragment extends AndroidxBaseFragment + implements IGetUserDataView, IGetHomePageView { private Context context; private GetUserDataPresenterImpl userDataPresenter; @@ -127,10 +128,10 @@ intent.setClass(context, PackageCaseUploadActivity.class); break; case "案卷核实": - intent.setClass(context, CaseVerifyActivity.class); + intent.setClass(context, VerifyCaseActivity.class); break; case "案卷核查": - intent.setClass(context, CaseCheckActivity.class); + intent.setClass(context, CheckCaseActivity.class); break; case "案卷处理": intent.setClass(context, CaseHandleActivity.class); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 51947e9..a8ce821 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -16,7 +16,7 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckFragment"; private Context context; - private CaseCheckPresenterImpl caseCheckPresenter; + private CaseCheckPresenterImpl checkPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseCheckPresenter = new CaseCheckPresenterImpl(this); - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter = new CaseCheckPresenterImpl(this); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; - checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + checkFragment.checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex, false); } else if (msg.what == 202104251) { if (checkFragment.isRefresh || checkFragment.isLoadMore) { checkFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseCheckPresenter != null) { - caseCheckPresenter.disposeRetrofitRequest(); + if (checkPresenter != null) { + checkPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index f0feb0c..2dd96b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckedFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckedFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckedFragment"; private Context context; - private CaseCheckedPresenterImpl caseCheckedPresenter; + private CaseCheckPresenterImpl checkedPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; private List dataBeans = new ArrayList<>(); @@ -46,8 +46,8 @@ @Override protected void initData() { - caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter = new CaseCheckPresenterImpl(this); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -60,7 +60,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -68,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -98,7 +98,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); + checkedFragment.checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex, true); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,8 +127,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -152,8 +151,8 @@ @Override public void onDestroyView() { - if (caseCheckedPresenter != null) { - caseCheckedPresenter.disposeRetrofitRequest(); + if (checkedPresenter != null) { + checkedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index c77d0e8..1c2a266 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseVerifiedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseVerifiedFragment extends AndroidxBaseFragment implements ICaseVerifyView { +public class CaseVerifiedFragment extends AndroidxBaseFragment implements IVerifyCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; - private CaseVerifiedPresenterImpl caseVerifiedPresenter; + private VerifyCasePresenterImpl verifiedPresenter; private int pageIndex = 1; private CaseVerifyResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter = new VerifyCasePresenterImpl(this); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -101,7 +101,7 @@ verifiedFragment.isRefresh = true; //刷新之后页码重置 verifiedFragment.pageIndex = 1; - verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex); + verifiedFragment.verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex, true); } else if (msg.what == 202104254) { if (verifiedFragment.isRefresh || verifiedFragment.isLoadMore) { verifiedFragment.adapter.notifyDataSetChanged(); @@ -130,8 +130,7 @@ } @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -155,8 +154,8 @@ @Override public void onDestroyView() { - if (caseVerifiedPresenter != null) { - caseVerifiedPresenter.disposeRetrofitRequest(); + if (verifiedPresenter != null) { + verifiedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 8676d4d..7cf9448 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.ui.CaseVerifyDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseVerifyFragment extends AndroidxBaseFragment implements ICaseVerifyView { +public class CaseVerifyFragment extends AndroidxBaseFragment implements IVerifyCaseView { private static final String TAG = "CaseVerifyFragment"; private Context context; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl verifyPresenter; private int pageIndex = 1; private CaseVerifyResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter = new VerifyCasePresenterImpl(this); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ verifyFragment.isRefresh = true; //刷新之后页码重置 verifyFragment.pageIndex = 1; - verifyFragment.caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex); + verifyFragment.verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex, false); } else if (msg.what == 202104253) { if (verifyFragment.isRefresh || verifyFragment.isLoadMore) { verifyFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { + public void obtainVerifyResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseVerifyPresenter != null) { - caseVerifyPresenter.disposeRetrofitRequest(); + if (verifyPresenter != null) { + verifyPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } 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 53dc6b0..d0eceb3 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 @@ -252,33 +252,33 @@ * 获取核实待办案卷 */ @POST("/case/toVerifyListPage") - Observable obtainCaseVerifyList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getVerifyResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核实已办案卷 */ @POST("/case/verifiedListPage") - Observable obtainCaseVerifiedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getVerifiedResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核查待办案卷 */ @POST("/case/toCheckListPage") - Observable obtainCaseCheckList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getCheckResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核查已办案卷 */ @POST("/case/checkedListPage") - Observable obtainCaseCheckedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getCheckedResult(@Header("token") String token, + @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 1e2279a..fe9d123 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 @@ -273,37 +273,37 @@ /** * 获取核实待办案卷 */ - public static Observable getCaseVerifyListResult(int limit, int offset) { + public static Observable getVerifyResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseVerifyList(AuthenticationHelper.getToken(), limit, offset); + return service.getVerifyResult(AuthenticationHelper.getToken(), limit, offset); } /** * 获取核实已办案卷 */ - public static Observable getCaseVerifiedListResult(int limit, int offset) { + public static Observable getVerifiedResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseVerifiedList(AuthenticationHelper.getToken(), limit, offset); + return service.getVerifiedResult(AuthenticationHelper.getToken(), limit, offset); } /** * 获取核查待办案卷 */ - public static Observable getCaseCheckListResult(int limit, int offset) { + public static Observable getCheckResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseCheckList(AuthenticationHelper.getToken(), limit, offset); + return service.getCheckResult(AuthenticationHelper.getToken(), limit, offset); } /** * 获取核查已办案卷 */ - public static Observable getCaseCheckedListResult(int limit, int offset) { + public static Observable getCheckedResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseCheckedList(AuthenticationHelper.getToken(), limit, offset); + return service.getCheckedResult(AuthenticationHelper.getToken(), limit, offset); } /** diff --git a/app/src/main/res/layout/activity_case_check.xml b/app/src/main/res/layout/activity_case_check.xml deleted file mode 100644 index 274469e..0000000 --- a/app/src/main/res/layout/activity_case_check.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml deleted file mode 100644 index 764678e..0000000 --- a/app/src/main/res/layout/activity_case_verify.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_case.xml b/app/src/main/res/layout/activity_check_case.xml new file mode 100644 index 0000000..274469e --- /dev/null +++ b/app/src/main/res/layout/activity_check_case.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 328588d..c4e854b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,11 +6,6 @@ - - - - - @@ -23,8 +18,12 @@ + + + + @@ -43,6 +42,7 @@ + @@ -75,7 +75,7 @@ - + @@ -94,7 +94,9 @@ + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1980751..cb07458 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -48,7 +48,7 @@ android:usesCleartextTraffic="true" tools:targetApi="m"> @@ -62,7 +62,7 @@ - + @@ -71,8 +71,8 @@ - - + + diff --git a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java index a7f80eb..ff000a1 100644 --- a/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/CaseVerifyResultAdapter.java @@ -19,8 +19,8 @@ public class CaseVerifyResultAdapter extends RecyclerView.Adapter { - private List dataBeans; - private LayoutInflater layoutInflater; + private final List dataBeans; + private final LayoutInflater layoutInflater; public CaseVerifyResultAdapter(Context context, List dataRows) { this.dataBeans = dataRows; @@ -35,7 +35,7 @@ } @Override - public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, int position) { + public void onBindViewHolder(@NonNull CaseVerifyResultAdapter.ItemViewHolder holder, @SuppressLint("RecyclerView") int position) { holder.bindView(dataBeans.get(position)); if (clickListener != null) { holder.itemView.setOnClickListener(new View.OnClickListener() { @@ -54,10 +54,10 @@ static class ItemViewHolder extends RecyclerView.ViewHolder { - private TextView leftTextView; - private TextView caseTitleView; - private TextView casePlaceView; - private TextView caseTimeView; + private final TextView leftTextView; + private final TextView caseTitleView; + private final TextView casePlaceView; + private final TextView caseTimeView; ItemViewHolder(@NonNull View itemView) { super(itemView); diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java deleted file mode 100644 index 6898b44..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseCheckModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseCheckModel { - Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java deleted file mode 100644 index d949d52..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseVerifyModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseVerifyModel { - Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java new file mode 100644 index 0000000..dec6258 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/ICheckCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface ICheckCaseModel { + Subscription checkCase(int limit, int offset, boolean isChecked); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java new file mode 100644 index 0000000..1781105 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IVerifyCaseModel.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IVerifyCaseModel { + Subscription verifyCase(int limit, int offset, boolean verified); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java deleted file mode 100644 index 6ae88d0..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseCheckModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.model.ICaseCheckModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseCheckModelImpl implements ICaseCheckModel { - - private final OnGetCaseCheckListener caseCheckListener; - - public CaseCheckModelImpl(OnGetCaseCheckListener listener) { - this.caseCheckListener = listener; - } - - /** - * {@link ICaseCheckModel} - *

- * 地图查看案卷-待核查 - */ - @Override - public Subscription sendCaseCheckRequest(int limit, int offset, boolean isChecked) { - Observable observable; - if (isChecked) { - observable = RetrofitServiceManager.getCaseCheckedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseCheckListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - caseCheckListener.onFailure(e); - } - } - - @Override - public void onNext(CaseCheckBean resultBean) { - if (resultBean != null) { - caseCheckListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java deleted file mode 100644 index eb42c38..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseVerifyModelImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.model.ICaseVerifyModel; -import com.casic.dcms.utils.retrofit.RetrofitServiceManager; - -import rx.Observable; -import rx.Observer; -import rx.Subscription; -import rx.android.schedulers.AndroidSchedulers; -import rx.schedulers.Schedulers; - -public class CaseVerifyModelImpl implements ICaseVerifyModel { - - private final OnGetCaseVerifyListener verifyListener; - - public CaseVerifyModelImpl(OnGetCaseVerifyListener listener) { - this.verifyListener = listener; - } - - /** - * {@link ICaseVerifyModel} - *

- * 地图查看案卷-待核实 - */ - @Override - public Subscription sendCaseVerifyRequest(int limit, int offset, boolean verified) { - Observable observable; - if (verified) { - observable = RetrofitServiceManager.getCaseVerifiedListResult(limit, offset); - } else { - observable = RetrofitServiceManager.getCaseVerifyListResult(limit, offset); - } - return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { - @Override - public void onCompleted() { - - } - - @Override - public void onError(Throwable e) { - if (e.getCause() != null) { - verifyListener.onFailure(e); - } - } - - @Override - public void onNext(CaseVerifyBean resultBean) { - if (resultBean != null) { - verifyListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java new file mode 100644 index 0000000..bbf832b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/CheckCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseCheckBean; +import com.casic.dcms.listener.OnGetCaseCheckListener; +import com.casic.dcms.mvp.model.ICheckCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class CheckCaseModelImpl implements ICheckCaseModel { + + private final OnGetCaseCheckListener caseCheckListener; + + public CheckCaseModelImpl(OnGetCaseCheckListener listener) { + this.caseCheckListener = listener; + } + + /** + * {@link ICheckCaseModel} + *

+ * 地图查看案卷-待核查 + */ + @Override + public Subscription checkCase(int limit, int offset, boolean isChecked) { + Observable observable; + if (isChecked) { + observable = RetrofitServiceManager.getCheckedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getCheckResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + caseCheckListener.onFailure(e); + } + } + + @Override + public void onNext(CaseCheckBean resultBean) { + if (resultBean != null) { + caseCheckListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java new file mode 100644 index 0000000..987b143 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/VerifyCaseModelImpl.java @@ -0,0 +1,56 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.model.IVerifyCaseModel; +import com.casic.dcms.utils.retrofit.RetrofitServiceManager; + +import rx.Observable; +import rx.Observer; +import rx.Subscription; +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +public class VerifyCaseModelImpl implements IVerifyCaseModel { + + private final OnGetCaseVerifyListener verifyListener; + + public VerifyCaseModelImpl(OnGetCaseVerifyListener listener) { + this.verifyListener = listener; + } + + /** + * {@link IVerifyCaseModel} + *

+ * 地图查看案卷-待核实 + */ + @Override + public Subscription verifyCase(int limit, int offset, boolean verified) { + Observable observable; + if (verified) { + observable = RetrofitServiceManager.getVerifiedResult(limit, offset); + } else { + observable = RetrofitServiceManager.getVerifyResult(limit, offset); + } + return observable.subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer() { + @Override + public void onCompleted() { + + } + + @Override + public void onError(Throwable e) { + if (e.getCause() != null) { + verifyListener.onFailure(e); + } + } + + @Override + public void onNext(CaseVerifyBean resultBean) { + if (resultBean != null) { + verifyListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java deleted file mode 100644 index 517696b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseCheckPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseCheckPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java deleted file mode 100644 index ac08a2e..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseVerifyPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseVerifyPresenter { - void onReadyRetrofitRequest(int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java new file mode 100644 index 0000000..32e93b5 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/ICheckCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface ICheckCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean isChecked); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java new file mode 100644 index 0000000..3383ec7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IVerifyCasePresenter.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.presenter; + +public interface IVerifyCasePresenter { + void onReadyRetrofitRequest(int limit, int offset, boolean verified); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java index fa330b0..6835d00 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckPresenterImpl.java @@ -3,23 +3,23 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.listener.OnGetCaseCheckListener; import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.model.impl.CheckCaseModelImpl; +import com.casic.dcms.mvp.presenter.ICheckCasePresenter; +import com.casic.dcms.mvp.view.ICheckCaseView; -public class CaseCheckPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { +public class CaseCheckPresenterImpl extends BasePresenter implements ICheckCasePresenter, OnGetCaseCheckListener { - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; + private final ICheckCaseView view; + private final CheckCaseModelImpl actionModel; - public CaseCheckPresenterImpl(ICaseCheckView caseCheckView) { + public CaseCheckPresenterImpl(ICheckCaseView caseCheckView) { this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); + actionModel = new CheckCaseModelImpl(this); } @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, false)); + public void onReadyRetrofitRequest(int limit, int offset, boolean isChecked) { + addSubscription(actionModel.checkCase(limit, offset, isChecked)); } @Override @@ -29,7 +29,7 @@ @Override public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); + view.obtainCheckResult(resultBean); } @Override diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java deleted file mode 100644 index 48e8a0c..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseCheckedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseCheckBean; -import com.casic.dcms.listener.OnGetCaseCheckListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseCheckModelImpl; -import com.casic.dcms.mvp.presenter.ICaseCheckPresenter; -import com.casic.dcms.mvp.view.ICaseCheckView; - -public class CaseCheckedPresenterImpl extends BasePresenter implements ICaseCheckPresenter, OnGetCaseCheckListener { - - private final ICaseCheckView view; - private final CaseCheckModelImpl actionModel; - - public CaseCheckedPresenterImpl(ICaseCheckView caseCheckView) { - this.view = caseCheckView; - actionModel = new CaseCheckModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseCheckRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseCheckBean resultBean) { - view.obtainCheckListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java deleted file mode 100644 index 23da074..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifiedPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifiedPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifiedPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, true)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java deleted file mode 100644 index 21d98bb..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseVerifyPresenterImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseVerifyBean; -import com.casic.dcms.listener.OnGetCaseVerifyListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseVerifyModelImpl; -import com.casic.dcms.mvp.presenter.ICaseVerifyPresenter; -import com.casic.dcms.mvp.view.ICaseVerifyView; - -public class CaseVerifyPresenterImpl extends BasePresenter implements ICaseVerifyPresenter, OnGetCaseVerifyListener { - - private final ICaseVerifyView view; - private final CaseVerifyModelImpl actionModel; - - public CaseVerifyPresenterImpl(ICaseVerifyView caseVerifyView) { - this.view = caseVerifyView; - actionModel = new CaseVerifyModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int limit, int offset) { - addSubscription(actionModel.sendCaseVerifyRequest(limit, offset, false)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseVerifyBean resultBean) { - view.obtainVerifyListResult(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java index 6720309..5eee9cb 100644 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/GetHomePagePresenterImpl.java @@ -5,14 +5,14 @@ import com.casic.dcms.mvp.BasePresenter; import com.casic.dcms.mvp.model.impl.GetHomePageModelImpl; import com.casic.dcms.mvp.presenter.IGetHomePagePresenter; -import com.casic.dcms.mvp.view.IHomePageView; +import com.casic.dcms.mvp.view.IGetHomePageView; public class GetHomePagePresenterImpl extends BasePresenter implements IGetHomePagePresenter, OnGetPageResultListener { - private final IHomePageView view; + private final IGetHomePageView view; private final GetHomePageModelImpl actionModel; - public GetHomePagePresenterImpl(IHomePageView homePageView) { + public GetHomePagePresenterImpl(IGetHomePageView homePageView) { this.view = homePageView; actionModel = new GetHomePageModelImpl(this); } diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java new file mode 100644 index 0000000..8da04d6 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/VerifyCasePresenterImpl.java @@ -0,0 +1,39 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseVerifyBean; +import com.casic.dcms.listener.OnGetCaseVerifyListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.VerifyCaseModelImpl; +import com.casic.dcms.mvp.presenter.IVerifyCasePresenter; +import com.casic.dcms.mvp.view.IVerifyCaseView; + +public class VerifyCasePresenterImpl extends BasePresenter implements IVerifyCasePresenter, OnGetCaseVerifyListener { + + private final IVerifyCaseView view; + private final VerifyCaseModelImpl actionModel; + + public VerifyCasePresenterImpl(IVerifyCaseView caseVerifyView) { + this.view = caseVerifyView; + actionModel = new VerifyCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(int limit, int offset, boolean verified) { + addSubscription(actionModel.verifyCase(limit, offset, verified)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseVerifyBean resultBean) { + view.obtainVerifyResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java deleted file mode 100644 index 9c36439..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseCheckView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseCheckBean; - -public interface ICaseCheckView { - void obtainCheckListResult(CaseCheckBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java deleted file mode 100644 index 23df490..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseVerifyView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseVerifyBean; - -public interface ICaseVerifyView { - void obtainVerifyListResult(CaseVerifyBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java new file mode 100644 index 0000000..9a494c4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/ICheckCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseCheckBean; + +public interface ICheckCaseView { + void obtainCheckResult(CaseCheckBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java new file mode 100644 index 0000000..4f1e3a4 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IGetHomePageView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.HomePageBean; + +public interface IGetHomePageView { + void obtainHomePageResult(HomePageBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java deleted file mode 100644 index fdf2f4f..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/IHomePageView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.HomePageBean; - -public interface IHomePageView { - void obtainHomePageResult(HomePageBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java new file mode 100644 index 0000000..adae8b7 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IVerifyCaseView.java @@ -0,0 +1,7 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseVerifyBean; + +public interface IVerifyCaseView { + void obtainVerifyResult(CaseVerifyBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java deleted file mode 100644 index b84fe46..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseCheckBinding; -import com.casic.dcms.ui.fragment.check.CaseCheckFragment; -import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author : Pengxh - * @time : 2021/4/16 9:24 - * @email : 290677893@qq.com - */ -public class CaseCheckActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核查"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseCheckFragment()); - fragmentList.add(new CaseCheckedFragment()); - SubViewPagerAdapter adapter = new - SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.checkViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index 6967e37..c097722 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -24,10 +24,10 @@ import com.casic.dcms.databinding.ActivityMapCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -54,11 +54,11 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, ICaseVerifyView, ICaseCheckView { + ICaseListHandleView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; private ListenableList graphicsOverlays; @@ -94,7 +94,7 @@ viewBinding.mapView.setMap(arcGISMap); caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); + caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 @@ -219,7 +219,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核实数据 - caseVerifyPresenter.onReadyRetrofitRequest(1000, 1); + caseVerifyPresenter.onReadyRetrofitRequest(1000, 1, false); break; case 2: viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -227,7 +227,7 @@ viewBinding.handleRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求待核查数据 - caseCheckPresenter.onReadyRetrofitRequest(1000, 1); + caseCheckPresenter.onReadyRetrofitRequest(1000, 1, false); break; default: break; @@ -283,8 +283,7 @@ * 待核实 */ @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifyListResult: " + new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -314,8 +313,7 @@ * 待核查 */ @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainCheckListResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java deleted file mode 100644 index 1e1a60c..0000000 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.casic.dcms.ui; - -import android.widget.LinearLayout; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.casic.dcms.R; -import com.casic.dcms.adapter.SubViewPagerAdapter; -import com.casic.dcms.base.AndroidxBaseActivity; -import com.casic.dcms.databinding.ActivityCaseVerifyBinding; -import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; -import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; -import com.casic.dcms.utils.Constant; - -import java.util.ArrayList; -import java.util.List; - -public class CaseVerifyActivity extends AndroidxBaseActivity { - - @Override - protected void setupTopBarLayout() { - viewBinding.titleBarLayout.titleView.setText("案卷核实"); - viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); - } - - @Override - protected void initData() { - List fragmentList = new ArrayList<>(); - fragmentList.add(new CaseVerifyFragment()); - fragmentList.add(new CaseVerifiedFragment()); - SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); - viewBinding.verifyViewPager.setAdapter(adapter); - //绑定TabLayout - viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); - LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); - linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); - linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); - } - - @Override - protected void initEvent() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java new file mode 100644 index 0000000..e48ddad --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/CheckCaseActivity.java @@ -0,0 +1,51 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityCheckCaseBinding; +import com.casic.dcms.ui.fragment.check.CaseCheckFragment; +import com.casic.dcms.ui.fragment.check.CaseCheckedFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : Pengxh + * @time : 2021/4/16 9:24 + * @email : 290677893@qq.com + */ +public class CheckCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核查"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseCheckFragment()); + fragmentList.add(new CaseCheckedFragment()); + SubViewPagerAdapter adapter = new + SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.checkViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.checkTabLayout.setupWithViewPager(viewBinding.checkViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.checkTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java new file mode 100644 index 0000000..5633eed --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/VerifyCaseActivity.java @@ -0,0 +1,45 @@ +package com.casic.dcms.ui; + +import android.widget.LinearLayout; + +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; + +import com.casic.dcms.R; +import com.casic.dcms.adapter.SubViewPagerAdapter; +import com.casic.dcms.base.AndroidxBaseActivity; +import com.casic.dcms.databinding.ActivityVerifyCaseBinding; +import com.casic.dcms.ui.fragment.verify.CaseVerifiedFragment; +import com.casic.dcms.ui.fragment.verify.CaseVerifyFragment; +import com.casic.dcms.utils.Constant; + +import java.util.ArrayList; +import java.util.List; + +public class VerifyCaseActivity extends AndroidxBaseActivity { + + @Override + protected void setupTopBarLayout() { + viewBinding.titleBarLayout.titleView.setText("案卷核实"); + viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + } + + @Override + protected void initData() { + List fragmentList = new ArrayList<>(); + fragmentList.add(new CaseVerifyFragment()); + fragmentList.add(new CaseVerifiedFragment()); + SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), Constant.CASE_PAGE_TITLES, fragmentList); + viewBinding.verifyViewPager.setAdapter(adapter); + //绑定TabLayout + viewBinding.verifyTabLayout.setupWithViewPager(viewBinding.verifyViewPager); + LinearLayout linearLayout = (LinearLayout) viewBinding.verifyTabLayout.getChildAt(0); + linearLayout.setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE); + linearLayout.setDividerDrawable(ContextCompat.getDrawable(this, R.drawable.layout_divider_vertical)); + } + + @Override + protected void initEvent() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java index aa89910..da3b461 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/HomePageFragment.java @@ -15,15 +15,14 @@ import com.casic.dcms.databinding.FragmentHomeBinding; import com.casic.dcms.mvp.presenter.impl.GetHomePagePresenterImpl; import com.casic.dcms.mvp.presenter.impl.GetUserDataPresenterImpl; +import com.casic.dcms.mvp.view.IGetHomePageView; import com.casic.dcms.mvp.view.IGetUserDataView; -import com.casic.dcms.mvp.view.IHomePageView; import com.casic.dcms.ui.BridgeMaintainActivity; -import com.casic.dcms.ui.CaseCheckActivity; import com.casic.dcms.ui.CaseHandleActivity; import com.casic.dcms.ui.CaseOnMapActivity; import com.casic.dcms.ui.CaseSearchActivity; -import com.casic.dcms.ui.CaseVerifyActivity; import com.casic.dcms.ui.ChangeShopInfoActivity; +import com.casic.dcms.ui.CheckCaseActivity; import com.casic.dcms.ui.CommonCaseUploadActivity; import com.casic.dcms.ui.DataAnalysisActivity; import com.casic.dcms.ui.DeptHandleActivity; @@ -36,6 +35,7 @@ import com.casic.dcms.ui.QuickCaseUploadActivity; import com.casic.dcms.ui.StreetlightManagerActivity; import com.casic.dcms.ui.UrgentCaseActivity; +import com.casic.dcms.ui.VerifyCaseActivity; import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.TimeOrDateUtil; @@ -44,7 +44,8 @@ import java.util.GregorianCalendar; -public class HomePageFragment extends AndroidxBaseFragment implements IGetUserDataView, IHomePageView { +public class HomePageFragment extends AndroidxBaseFragment + implements IGetUserDataView, IGetHomePageView { private Context context; private GetUserDataPresenterImpl userDataPresenter; @@ -127,10 +128,10 @@ intent.setClass(context, PackageCaseUploadActivity.class); break; case "案卷核实": - intent.setClass(context, CaseVerifyActivity.class); + intent.setClass(context, VerifyCaseActivity.class); break; case "案卷核查": - intent.setClass(context, CaseCheckActivity.class); + intent.setClass(context, CheckCaseActivity.class); break; case "案卷处理": intent.setClass(context, CaseHandleActivity.class); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java index 51947e9..a8ce821 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckFragment.java @@ -16,7 +16,7 @@ import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckFragment"; private Context context; - private CaseCheckPresenterImpl caseCheckPresenter; + private CaseCheckPresenterImpl checkPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseCheckPresenter = new CaseCheckPresenterImpl(this); - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter = new CaseCheckPresenterImpl(this); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ checkFragment.isRefresh = true; //刷新之后页码重置 checkFragment.pageIndex = 1; - checkFragment.caseCheckPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex); + checkFragment.checkPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkFragment.pageIndex, false); } else if (msg.what == 202104251) { if (checkFragment.isRefresh || checkFragment.isLoadMore) { checkFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseCheckPresenter != null) { - caseCheckPresenter.disposeRetrofitRequest(); + if (checkPresenter != null) { + checkPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java index f0feb0c..2dd96b5 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/check/CaseCheckedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.databinding.FragmentCheckCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseCheckedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseCheckView; +import com.casic.dcms.mvp.presenter.impl.CaseCheckPresenterImpl; +import com.casic.dcms.mvp.view.ICheckCaseView; import com.casic.dcms.ui.CaseCheckedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseCheckedFragment extends AndroidxBaseFragment implements ICaseCheckView { +public class CaseCheckedFragment extends AndroidxBaseFragment implements ICheckCaseView { private static final String TAG = "CaseCheckedFragment"; private Context context; - private CaseCheckedPresenterImpl caseCheckedPresenter; + private CaseCheckPresenterImpl checkedPresenter; private int pageIndex = 1; private CaseCheckResultAdapter adapter; private List dataBeans = new ArrayList<>(); @@ -46,8 +46,8 @@ @Override protected void initData() { - caseCheckedPresenter = new CaseCheckedPresenterImpl(this); - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter = new CaseCheckPresenterImpl(this); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -60,7 +60,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -68,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -98,7 +98,7 @@ checkedFragment.isRefresh = true; //刷新之后页码重置 checkedFragment.pageIndex = 1; - checkedFragment.caseCheckedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex); + checkedFragment.checkedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, checkedFragment.pageIndex, true); } else if (msg.what == 202104252) { if (checkedFragment.isRefresh || checkedFragment.isLoadMore) { checkedFragment.adapter.notifyDataSetChanged(); @@ -127,8 +127,7 @@ } @Override - public void obtainCheckListResult(CaseCheckBean resultBean) { -// Log.d(TAG, "obtainHandledResult: " + new Gson().toJson(resultBean)); + public void obtainCheckResult(CaseCheckBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -152,8 +151,8 @@ @Override public void onDestroyView() { - if (caseCheckedPresenter != null) { - caseCheckedPresenter.disposeRetrofitRequest(); + if (checkedPresenter != null) { + checkedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java index c77d0e8..1c2a266 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifiedFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseVerifiedPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.ui.CaseVerifiedDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseVerifiedFragment extends AndroidxBaseFragment implements ICaseVerifyView { +public class CaseVerifiedFragment extends AndroidxBaseFragment implements IVerifyCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; - private CaseVerifiedPresenterImpl caseVerifiedPresenter; + private VerifyCasePresenterImpl verifiedPresenter; private int pageIndex = 1; private CaseVerifyResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseVerifiedPresenter = new CaseVerifiedPresenterImpl(this); - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter = new VerifyCasePresenterImpl(this); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, true); } }); } @@ -101,7 +101,7 @@ verifiedFragment.isRefresh = true; //刷新之后页码重置 verifiedFragment.pageIndex = 1; - verifiedFragment.caseVerifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex); + verifiedFragment.verifiedPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifiedFragment.pageIndex, true); } else if (msg.what == 202104254) { if (verifiedFragment.isRefresh || verifiedFragment.isLoadMore) { verifiedFragment.adapter.notifyDataSetChanged(); @@ -130,8 +130,7 @@ } @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { -// Log.d(TAG, "obtainVerifiedListResult: "+new Gson().toJson(resultBean)); + public void obtainVerifyResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -155,8 +154,8 @@ @Override public void onDestroyView() { - if (caseVerifiedPresenter != null) { - caseVerifiedPresenter.disposeRetrofitRequest(); + if (verifiedPresenter != null) { + verifiedPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java index 8676d4d..7cf9448 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/verify/CaseVerifyFragment.java @@ -15,8 +15,8 @@ import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.databinding.FragmentVerifyCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseVerifyPresenterImpl; -import com.casic.dcms.mvp.view.ICaseVerifyView; +import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; +import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.ui.CaseVerifyDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.List; -public class CaseVerifyFragment extends AndroidxBaseFragment implements ICaseVerifyView { +public class CaseVerifyFragment extends AndroidxBaseFragment implements IVerifyCaseView { private static final String TAG = "CaseVerifyFragment"; private Context context; - private CaseVerifyPresenterImpl caseVerifyPresenter; + private VerifyCasePresenterImpl verifyPresenter; private int pageIndex = 1; private CaseVerifyResultAdapter adapter; /** @@ -49,8 +49,8 @@ @Override protected void initData() { - caseVerifyPresenter = new CaseVerifyPresenterImpl(this); - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter = new VerifyCasePresenterImpl(this); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +63,7 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +71,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex); + verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, pageIndex, false); } }); } @@ -101,7 +101,7 @@ verifyFragment.isRefresh = true; //刷新之后页码重置 verifyFragment.pageIndex = 1; - verifyFragment.caseVerifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex); + verifyFragment.verifyPresenter.onReadyRetrofitRequest(Constant.PAGE_LIMIT, verifyFragment.pageIndex, false); } else if (msg.what == 202104253) { if (verifyFragment.isRefresh || verifyFragment.isLoadMore) { verifyFragment.adapter.notifyDataSetChanged(); @@ -130,7 +130,7 @@ } @Override - public void obtainVerifyListResult(CaseVerifyBean resultBean) { + public void obtainVerifyResult(CaseVerifyBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,8 +154,8 @@ @Override public void onDestroyView() { - if (caseVerifyPresenter != null) { - caseVerifyPresenter.disposeRetrofitRequest(); + if (verifyPresenter != null) { + verifyPresenter.disposeRetrofitRequest(); } super.onDestroyView(); } 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 53dc6b0..d0eceb3 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 @@ -252,33 +252,33 @@ * 获取核实待办案卷 */ @POST("/case/toVerifyListPage") - Observable obtainCaseVerifyList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getVerifyResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核实已办案卷 */ @POST("/case/verifiedListPage") - Observable obtainCaseVerifiedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getVerifiedResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核查待办案卷 */ @POST("/case/toCheckListPage") - Observable obtainCaseCheckList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getCheckResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 获取核查已办案卷 */ @POST("/case/checkedListPage") - Observable obtainCaseCheckedList(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getCheckedResult(@Header("token") String token, + @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 1e2279a..fe9d123 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 @@ -273,37 +273,37 @@ /** * 获取核实待办案卷 */ - public static Observable getCaseVerifyListResult(int limit, int offset) { + public static Observable getVerifyResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseVerifyList(AuthenticationHelper.getToken(), limit, offset); + return service.getVerifyResult(AuthenticationHelper.getToken(), limit, offset); } /** * 获取核实已办案卷 */ - public static Observable getCaseVerifiedListResult(int limit, int offset) { + public static Observable getVerifiedResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseVerifiedList(AuthenticationHelper.getToken(), limit, offset); + return service.getVerifiedResult(AuthenticationHelper.getToken(), limit, offset); } /** * 获取核查待办案卷 */ - public static Observable getCaseCheckListResult(int limit, int offset) { + public static Observable getCheckResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseCheckList(AuthenticationHelper.getToken(), limit, offset); + return service.getCheckResult(AuthenticationHelper.getToken(), limit, offset); } /** * 获取核查已办案卷 */ - public static Observable getCaseCheckedListResult(int limit, int offset) { + public static Observable getCheckedResult(int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainCaseCheckedList(AuthenticationHelper.getToken(), limit, offset); + return service.getCheckedResult(AuthenticationHelper.getToken(), limit, offset); } /** diff --git a/app/src/main/res/layout/activity_case_check.xml b/app/src/main/res/layout/activity_case_check.xml deleted file mode 100644 index 274469e..0000000 --- a/app/src/main/res/layout/activity_case_check.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_case_verify.xml b/app/src/main/res/layout/activity_case_verify.xml deleted file mode 100644 index 764678e..0000000 --- a/app/src/main/res/layout/activity_case_verify.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_case.xml b/app/src/main/res/layout/activity_check_case.xml new file mode 100644 index 0000000..274469e --- /dev/null +++ b/app/src/main/res/layout/activity_check_case.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_verify_case.xml b/app/src/main/res/layout/activity_verify_case.xml new file mode 100644 index 0000000..764678e --- /dev/null +++ b/app/src/main/res/layout/activity_verify_case.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + \ No newline at end of file