diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java deleted file mode 100644 index 2e0d2bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.listener.OnGetCaseHandledListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandledListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandledPresenter; -import com.casic.dcms.mvp.view.ICaseListHandledView; - -public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, - OnGetCaseHandledListListener { - - private final ICaseListHandledView view; - private final CaseHandledListModelImpl actionModel; - - public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendCaseHandledListRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandledBean resultBean) { - view.obtainCaseHandledList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java deleted file mode 100644 index 2e0d2bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.listener.OnGetCaseHandledListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandledListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandledPresenter; -import com.casic.dcms.mvp.view.ICaseListHandledView; - -public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, - OnGetCaseHandledListListener { - - private final ICaseListHandledView view; - private final CaseHandledListModelImpl actionModel; - - public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendCaseHandledListRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandledBean resultBean) { - view.obtainCaseHandledList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java new file mode 100644 index 0000000..3b8b01b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.HandleCaseModelImpl; +import com.casic.dcms.mvp.presenter.IHandleCasePresenter; +import com.casic.dcms.mvp.view.IHandleCaseView; + +public class HandleCasePresenterImpl extends BasePresenter implements IHandleCasePresenter, OnGetCaseHandleListListener { + + private final IHandleCaseView view; + private final HandleCaseModelImpl actionModel; + + public HandleCasePresenterImpl(IHandleCaseView handleCaseView) { + this.view = handleCaseView; + actionModel = new HandleCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.handleCase(isOvertime, isEmergent, limit, offset)); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.handleCase(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseHandleBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onSuccess(CaseHandledBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java deleted file mode 100644 index 2e0d2bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.listener.OnGetCaseHandledListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandledListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandledPresenter; -import com.casic.dcms.mvp.view.ICaseListHandledView; - -public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, - OnGetCaseHandledListListener { - - private final ICaseListHandledView view; - private final CaseHandledListModelImpl actionModel; - - public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendCaseHandledListRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandledBean resultBean) { - view.obtainCaseHandledList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java new file mode 100644 index 0000000..3b8b01b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.HandleCaseModelImpl; +import com.casic.dcms.mvp.presenter.IHandleCasePresenter; +import com.casic.dcms.mvp.view.IHandleCaseView; + +public class HandleCasePresenterImpl extends BasePresenter implements IHandleCasePresenter, OnGetCaseHandleListListener { + + private final IHandleCaseView view; + private final HandleCaseModelImpl actionModel; + + public HandleCasePresenterImpl(IHandleCaseView handleCaseView) { + this.view = handleCaseView; + actionModel = new HandleCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.handleCase(isOvertime, isEmergent, limit, offset)); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.handleCase(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseHandleBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onSuccess(CaseHandledBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java deleted file mode 100644 index d7a89ec..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseListHandleView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java deleted file mode 100644 index 2e0d2bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.listener.OnGetCaseHandledListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandledListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandledPresenter; -import com.casic.dcms.mvp.view.ICaseListHandledView; - -public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, - OnGetCaseHandledListListener { - - private final ICaseListHandledView view; - private final CaseHandledListModelImpl actionModel; - - public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendCaseHandledListRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandledBean resultBean) { - view.obtainCaseHandledList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java new file mode 100644 index 0000000..3b8b01b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.HandleCaseModelImpl; +import com.casic.dcms.mvp.presenter.IHandleCasePresenter; +import com.casic.dcms.mvp.view.IHandleCaseView; + +public class HandleCasePresenterImpl extends BasePresenter implements IHandleCasePresenter, OnGetCaseHandleListListener { + + private final IHandleCaseView view; + private final HandleCaseModelImpl actionModel; + + public HandleCasePresenterImpl(IHandleCaseView handleCaseView) { + this.view = handleCaseView; + actionModel = new HandleCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.handleCase(isOvertime, isEmergent, limit, offset)); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.handleCase(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseHandleBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onSuccess(CaseHandledBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java deleted file mode 100644 index d7a89ec..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseListHandleView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java new file mode 100644 index 0000000..436339c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java @@ -0,0 +1,10 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; + +public interface IHandleCaseView { + void obtainHandleResult(CaseHandleBean resultBean); + + void obtainHandleResult(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java deleted file mode 100644 index 2e0d2bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.listener.OnGetCaseHandledListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandledListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandledPresenter; -import com.casic.dcms.mvp.view.ICaseListHandledView; - -public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, - OnGetCaseHandledListListener { - - private final ICaseListHandledView view; - private final CaseHandledListModelImpl actionModel; - - public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendCaseHandledListRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandledBean resultBean) { - view.obtainCaseHandledList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java new file mode 100644 index 0000000..3b8b01b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.HandleCaseModelImpl; +import com.casic.dcms.mvp.presenter.IHandleCasePresenter; +import com.casic.dcms.mvp.view.IHandleCaseView; + +public class HandleCasePresenterImpl extends BasePresenter implements IHandleCasePresenter, OnGetCaseHandleListListener { + + private final IHandleCaseView view; + private final HandleCaseModelImpl actionModel; + + public HandleCasePresenterImpl(IHandleCaseView handleCaseView) { + this.view = handleCaseView; + actionModel = new HandleCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.handleCase(isOvertime, isEmergent, limit, offset)); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.handleCase(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseHandleBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onSuccess(CaseHandledBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java deleted file mode 100644 index d7a89ec..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseListHandleView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java new file mode 100644 index 0000000..436339c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java @@ -0,0 +1,10 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; + +public interface IHandleCaseView { + void obtainHandleResult(CaseHandleBean resultBean); + + void obtainHandleResult(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 2e5ac22..9124331 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.databinding.ActivityCaseHandleBinding; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ @Override protected void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new OvertimeCaseFragment()); - fragmentList.add(new UrgentCaseFragment()); + fragmentList.add(new CaseOverTimeFragment()); + fragmentList.add(new CaseUrgentFragment()); fragmentList.add(new CaseTodoFragment()); fragmentList.add(new CaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), pageTitles, fragmentList); diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java deleted file mode 100644 index 2e0d2bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.listener.OnGetCaseHandledListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandledListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandledPresenter; -import com.casic.dcms.mvp.view.ICaseListHandledView; - -public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, - OnGetCaseHandledListListener { - - private final ICaseListHandledView view; - private final CaseHandledListModelImpl actionModel; - - public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendCaseHandledListRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandledBean resultBean) { - view.obtainCaseHandledList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java new file mode 100644 index 0000000..3b8b01b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.HandleCaseModelImpl; +import com.casic.dcms.mvp.presenter.IHandleCasePresenter; +import com.casic.dcms.mvp.view.IHandleCaseView; + +public class HandleCasePresenterImpl extends BasePresenter implements IHandleCasePresenter, OnGetCaseHandleListListener { + + private final IHandleCaseView view; + private final HandleCaseModelImpl actionModel; + + public HandleCasePresenterImpl(IHandleCaseView handleCaseView) { + this.view = handleCaseView; + actionModel = new HandleCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.handleCase(isOvertime, isEmergent, limit, offset)); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.handleCase(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseHandleBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onSuccess(CaseHandledBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java deleted file mode 100644 index d7a89ec..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseListHandleView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java new file mode 100644 index 0000000..436339c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java @@ -0,0 +1,10 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; + +public interface IHandleCaseView { + void obtainHandleResult(CaseHandleBean resultBean); + + void obtainHandleResult(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 2e5ac22..9124331 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.databinding.ActivityCaseHandleBinding; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ @Override protected void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new OvertimeCaseFragment()); - fragmentList.add(new UrgentCaseFragment()); + fragmentList.add(new CaseOverTimeFragment()); + fragmentList.add(new CaseUrgentFragment()); fragmentList.add(new CaseTodoFragment()); fragmentList.add(new CaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), pageTitles, fragmentList); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index be3d75a..86bc63f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -28,9 +28,9 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseTimeoutFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -336,11 +336,11 @@ ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); switch (title) { case "超时案卷": - OvertimeCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseTimeoutFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "紧急案卷": - UrgentCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseUrgentFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "待办案卷": diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java deleted file mode 100644 index 2e0d2bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.listener.OnGetCaseHandledListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandledListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandledPresenter; -import com.casic.dcms.mvp.view.ICaseListHandledView; - -public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, - OnGetCaseHandledListListener { - - private final ICaseListHandledView view; - private final CaseHandledListModelImpl actionModel; - - public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendCaseHandledListRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandledBean resultBean) { - view.obtainCaseHandledList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java new file mode 100644 index 0000000..3b8b01b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.HandleCaseModelImpl; +import com.casic.dcms.mvp.presenter.IHandleCasePresenter; +import com.casic.dcms.mvp.view.IHandleCaseView; + +public class HandleCasePresenterImpl extends BasePresenter implements IHandleCasePresenter, OnGetCaseHandleListListener { + + private final IHandleCaseView view; + private final HandleCaseModelImpl actionModel; + + public HandleCasePresenterImpl(IHandleCaseView handleCaseView) { + this.view = handleCaseView; + actionModel = new HandleCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.handleCase(isOvertime, isEmergent, limit, offset)); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.handleCase(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseHandleBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onSuccess(CaseHandledBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java deleted file mode 100644 index d7a89ec..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseListHandleView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java new file mode 100644 index 0000000..436339c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java @@ -0,0 +1,10 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; + +public interface IHandleCaseView { + void obtainHandleResult(CaseHandleBean resultBean); + + void obtainHandleResult(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 2e5ac22..9124331 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.databinding.ActivityCaseHandleBinding; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ @Override protected void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new OvertimeCaseFragment()); - fragmentList.add(new UrgentCaseFragment()); + fragmentList.add(new CaseOverTimeFragment()); + fragmentList.add(new CaseUrgentFragment()); fragmentList.add(new CaseTodoFragment()); fragmentList.add(new CaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), pageTitles, fragmentList); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index be3d75a..86bc63f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -28,9 +28,9 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseTimeoutFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -336,11 +336,11 @@ ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); switch (title) { case "超时案卷": - OvertimeCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseTimeoutFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "紧急案卷": - UrgentCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseUrgentFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "待办案卷": 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 c097722..1369d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -19,14 +19,15 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; 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.HandleCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; @@ -54,10 +55,10 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, IVerifyCaseView, ICheckCaseView { + IHandleCaseView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; - private CaseListHandlePresenterImpl caseHandleListPresenter; + private HandleCasePresenterImpl handleCasePresenter; private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -93,12 +94,12 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); viewBinding.mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); + handleCasePresenter = new HandleCasePresenterImpl(this); caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); //Marker相关Layer graphicsOverlays = viewBinding.mapView.getGraphicsOverlays(); @@ -211,7 +212,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); break; case 1: viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -238,8 +239,7 @@ * 处理中 */ @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); + public void obtainHandleResult(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -265,6 +265,11 @@ } } + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + /** * 关联Marker和案卷 * @@ -390,8 +395,8 @@ @Override protected void onDestroy() { viewBinding.mapView.dispose(); - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); } if (caseVerifyPresenter != null) { caseVerifyPresenter.disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java deleted file mode 100644 index 2e0d2bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.listener.OnGetCaseHandledListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandledListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandledPresenter; -import com.casic.dcms.mvp.view.ICaseListHandledView; - -public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, - OnGetCaseHandledListListener { - - private final ICaseListHandledView view; - private final CaseHandledListModelImpl actionModel; - - public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendCaseHandledListRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandledBean resultBean) { - view.obtainCaseHandledList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java new file mode 100644 index 0000000..3b8b01b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.HandleCaseModelImpl; +import com.casic.dcms.mvp.presenter.IHandleCasePresenter; +import com.casic.dcms.mvp.view.IHandleCaseView; + +public class HandleCasePresenterImpl extends BasePresenter implements IHandleCasePresenter, OnGetCaseHandleListListener { + + private final IHandleCaseView view; + private final HandleCaseModelImpl actionModel; + + public HandleCasePresenterImpl(IHandleCaseView handleCaseView) { + this.view = handleCaseView; + actionModel = new HandleCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.handleCase(isOvertime, isEmergent, limit, offset)); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.handleCase(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseHandleBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onSuccess(CaseHandledBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java deleted file mode 100644 index d7a89ec..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseListHandleView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java new file mode 100644 index 0000000..436339c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java @@ -0,0 +1,10 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; + +public interface IHandleCaseView { + void obtainHandleResult(CaseHandleBean resultBean); + + void obtainHandleResult(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 2e5ac22..9124331 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.databinding.ActivityCaseHandleBinding; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ @Override protected void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new OvertimeCaseFragment()); - fragmentList.add(new UrgentCaseFragment()); + fragmentList.add(new CaseOverTimeFragment()); + fragmentList.add(new CaseUrgentFragment()); fragmentList.add(new CaseTodoFragment()); fragmentList.add(new CaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), pageTitles, fragmentList); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index be3d75a..86bc63f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -28,9 +28,9 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseTimeoutFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -336,11 +336,11 @@ ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); switch (title) { case "超时案卷": - OvertimeCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseTimeoutFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "紧急案卷": - UrgentCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseUrgentFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "待办案卷": 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 c097722..1369d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -19,14 +19,15 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; 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.HandleCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; @@ -54,10 +55,10 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, IVerifyCaseView, ICheckCaseView { + IHandleCaseView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; - private CaseListHandlePresenterImpl caseHandleListPresenter; + private HandleCasePresenterImpl handleCasePresenter; private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -93,12 +94,12 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); viewBinding.mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); + handleCasePresenter = new HandleCasePresenterImpl(this); caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); //Marker相关Layer graphicsOverlays = viewBinding.mapView.getGraphicsOverlays(); @@ -211,7 +212,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); break; case 1: viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -238,8 +239,7 @@ * 处理中 */ @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); + public void obtainHandleResult(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -265,6 +265,11 @@ } } + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + /** * 关联Marker和案卷 * @@ -390,8 +395,8 @@ @Override protected void onDestroy() { viewBinding.mapView.dispose(); - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); } if (caseVerifyPresenter != null) { caseVerifyPresenter.disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 14b04ff..392897c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -13,10 +13,11 @@ import com.casic.dcms.adapter.CaseHandledAdapter; import com.casic.dcms.base.AndroidxBaseFragment; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandledPresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandledView; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,12 +29,12 @@ import java.util.ArrayList; import java.util.List; -public class CaseHandledFragment extends AndroidxBaseFragment implements ICaseListHandledView { +public class CaseHandledFragment extends AndroidxBaseFragment implements IHandleCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; private int pageIndex = 1; - private CaseListHandledPresenterImpl caseHandledListPresenter; + private HandleCasePresenterImpl handledCasePresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -46,8 +47,8 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseListHandledPresenterImpl(this); - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter = new HandleCasePresenterImpl(this); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -59,7 +60,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -67,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); } @@ -97,7 +98,7 @@ handledFragment.isRefresh = true; //刷新之后页码重置 handledFragment.pageIndex = 1; - handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + handledFragment.handledCasePresenter.onReadyRetrofitRequest(handledFragment.pageIndex); } else if (msg.what == 202104288) { if (handledFragment.isRefresh || handledFragment.isLoadMore) { handledFragment.adapter.notifyDataSetChanged(); @@ -126,7 +127,12 @@ } @Override - public void obtainCaseHandledList(CaseHandledBean resultBean) { + public void obtainHandleResult(CaseHandleBean resultBean) { + + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -150,8 +156,8 @@ @Override public void onDestroyView() { - if (caseHandledListPresenter != null) { - caseHandledListPresenter.disposeRetrofitRequest(); + if (handledCasePresenter != null) { + handledCasePresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java deleted file mode 100644 index 2e0d2bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.listener.OnGetCaseHandledListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandledListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandledPresenter; -import com.casic.dcms.mvp.view.ICaseListHandledView; - -public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, - OnGetCaseHandledListListener { - - private final ICaseListHandledView view; - private final CaseHandledListModelImpl actionModel; - - public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendCaseHandledListRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandledBean resultBean) { - view.obtainCaseHandledList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java new file mode 100644 index 0000000..3b8b01b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.HandleCaseModelImpl; +import com.casic.dcms.mvp.presenter.IHandleCasePresenter; +import com.casic.dcms.mvp.view.IHandleCaseView; + +public class HandleCasePresenterImpl extends BasePresenter implements IHandleCasePresenter, OnGetCaseHandleListListener { + + private final IHandleCaseView view; + private final HandleCaseModelImpl actionModel; + + public HandleCasePresenterImpl(IHandleCaseView handleCaseView) { + this.view = handleCaseView; + actionModel = new HandleCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.handleCase(isOvertime, isEmergent, limit, offset)); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.handleCase(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseHandleBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onSuccess(CaseHandledBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java deleted file mode 100644 index d7a89ec..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseListHandleView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java new file mode 100644 index 0000000..436339c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java @@ -0,0 +1,10 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; + +public interface IHandleCaseView { + void obtainHandleResult(CaseHandleBean resultBean); + + void obtainHandleResult(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 2e5ac22..9124331 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.databinding.ActivityCaseHandleBinding; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ @Override protected void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new OvertimeCaseFragment()); - fragmentList.add(new UrgentCaseFragment()); + fragmentList.add(new CaseOverTimeFragment()); + fragmentList.add(new CaseUrgentFragment()); fragmentList.add(new CaseTodoFragment()); fragmentList.add(new CaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), pageTitles, fragmentList); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index be3d75a..86bc63f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -28,9 +28,9 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseTimeoutFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -336,11 +336,11 @@ ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); switch (title) { case "超时案卷": - OvertimeCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseTimeoutFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "紧急案卷": - UrgentCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseUrgentFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "待办案卷": 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 c097722..1369d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -19,14 +19,15 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; 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.HandleCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; @@ -54,10 +55,10 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, IVerifyCaseView, ICheckCaseView { + IHandleCaseView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; - private CaseListHandlePresenterImpl caseHandleListPresenter; + private HandleCasePresenterImpl handleCasePresenter; private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -93,12 +94,12 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); viewBinding.mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); + handleCasePresenter = new HandleCasePresenterImpl(this); caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); //Marker相关Layer graphicsOverlays = viewBinding.mapView.getGraphicsOverlays(); @@ -211,7 +212,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); break; case 1: viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -238,8 +239,7 @@ * 处理中 */ @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); + public void obtainHandleResult(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -265,6 +265,11 @@ } } + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + /** * 关联Marker和案卷 * @@ -390,8 +395,8 @@ @Override protected void onDestroy() { viewBinding.mapView.dispose(); - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); } if (caseVerifyPresenter != null) { caseVerifyPresenter.disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 14b04ff..392897c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -13,10 +13,11 @@ import com.casic.dcms.adapter.CaseHandledAdapter; import com.casic.dcms.base.AndroidxBaseFragment; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandledPresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandledView; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,12 +29,12 @@ import java.util.ArrayList; import java.util.List; -public class CaseHandledFragment extends AndroidxBaseFragment implements ICaseListHandledView { +public class CaseHandledFragment extends AndroidxBaseFragment implements IHandleCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; private int pageIndex = 1; - private CaseListHandledPresenterImpl caseHandledListPresenter; + private HandleCasePresenterImpl handledCasePresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -46,8 +47,8 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseListHandledPresenterImpl(this); - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter = new HandleCasePresenterImpl(this); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -59,7 +60,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -67,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); } @@ -97,7 +98,7 @@ handledFragment.isRefresh = true; //刷新之后页码重置 handledFragment.pageIndex = 1; - handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + handledFragment.handledCasePresenter.onReadyRetrofitRequest(handledFragment.pageIndex); } else if (msg.what == 202104288) { if (handledFragment.isRefresh || handledFragment.isLoadMore) { handledFragment.adapter.notifyDataSetChanged(); @@ -126,7 +127,12 @@ } @Override - public void obtainCaseHandledList(CaseHandledBean resultBean) { + public void obtainHandleResult(CaseHandleBean resultBean) { + + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -150,8 +156,8 @@ @Override public void onDestroyView() { - if (caseHandledListPresenter != null) { - caseHandledListPresenter.disposeRetrofitRequest(); + if (handledCasePresenter != null) { + handledCasePresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java new file mode 100644 index 0000000..2176313 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java @@ -0,0 +1,169 @@ +package com.casic.dcms.ui.fragment.handle; + +import android.content.Context; +import android.content.Intent; +import android.os.Handler; +import android.os.Message; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.base.AndroidxBaseFragment; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.databinding.FragmentHandleCaseBinding; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; +import com.casic.dcms.ui.CaseHandleDetailActivity; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +public class CaseOverTimeFragment extends AndroidxBaseFragment implements IHandleCaseView { + + private static final String TAG = "OvertimeCaseFragment"; + private Context context; + private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private boolean isRefresh, isLoadMore = false; + private HandleCasePresenterImpl handleCasePresenter; + private CaseHandleAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + handleCasePresenter = new HandleCasePresenterImpl(this); + /** + * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 + * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 + */ + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + pageIndex = 1; + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + } + }); + viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + } + }); + } + + /** + * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private final WeakReference reference; + + private WeakReferenceHandler(CaseOverTimeFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseOverTimeFragment overtimeCaseFragment = reference.get(); + if (msg.what == Constant.CASE_HANDLE_OK) { + Log.d(TAG, "超时案卷处理成功，更新列表"); + overtimeCaseFragment.isRefresh = true; + //刷新之后页码重置 + overtimeCaseFragment.pageIndex = 1; + overtimeCaseFragment.handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.viewBinding.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.viewBinding.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainHandleResult(CaseHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + viewBinding.refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + viewBinding.refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(202104285); + } + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override + public void onDestroyView() { + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); + } + super.onDestroyView(); + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java deleted file mode 100644 index 2e0d2bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.listener.OnGetCaseHandledListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandledListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandledPresenter; -import com.casic.dcms.mvp.view.ICaseListHandledView; - -public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, - OnGetCaseHandledListListener { - - private final ICaseListHandledView view; - private final CaseHandledListModelImpl actionModel; - - public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendCaseHandledListRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandledBean resultBean) { - view.obtainCaseHandledList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java new file mode 100644 index 0000000..3b8b01b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.HandleCaseModelImpl; +import com.casic.dcms.mvp.presenter.IHandleCasePresenter; +import com.casic.dcms.mvp.view.IHandleCaseView; + +public class HandleCasePresenterImpl extends BasePresenter implements IHandleCasePresenter, OnGetCaseHandleListListener { + + private final IHandleCaseView view; + private final HandleCaseModelImpl actionModel; + + public HandleCasePresenterImpl(IHandleCaseView handleCaseView) { + this.view = handleCaseView; + actionModel = new HandleCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.handleCase(isOvertime, isEmergent, limit, offset)); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.handleCase(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseHandleBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onSuccess(CaseHandledBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java deleted file mode 100644 index d7a89ec..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseListHandleView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java new file mode 100644 index 0000000..436339c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java @@ -0,0 +1,10 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; + +public interface IHandleCaseView { + void obtainHandleResult(CaseHandleBean resultBean); + + void obtainHandleResult(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 2e5ac22..9124331 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.databinding.ActivityCaseHandleBinding; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ @Override protected void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new OvertimeCaseFragment()); - fragmentList.add(new UrgentCaseFragment()); + fragmentList.add(new CaseOverTimeFragment()); + fragmentList.add(new CaseUrgentFragment()); fragmentList.add(new CaseTodoFragment()); fragmentList.add(new CaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), pageTitles, fragmentList); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index be3d75a..86bc63f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -28,9 +28,9 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseTimeoutFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -336,11 +336,11 @@ ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); switch (title) { case "超时案卷": - OvertimeCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseTimeoutFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "紧急案卷": - UrgentCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseUrgentFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "待办案卷": 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 c097722..1369d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -19,14 +19,15 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; 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.HandleCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; @@ -54,10 +55,10 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, IVerifyCaseView, ICheckCaseView { + IHandleCaseView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; - private CaseListHandlePresenterImpl caseHandleListPresenter; + private HandleCasePresenterImpl handleCasePresenter; private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -93,12 +94,12 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); viewBinding.mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); + handleCasePresenter = new HandleCasePresenterImpl(this); caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); //Marker相关Layer graphicsOverlays = viewBinding.mapView.getGraphicsOverlays(); @@ -211,7 +212,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); break; case 1: viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -238,8 +239,7 @@ * 处理中 */ @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); + public void obtainHandleResult(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -265,6 +265,11 @@ } } + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + /** * 关联Marker和案卷 * @@ -390,8 +395,8 @@ @Override protected void onDestroy() { viewBinding.mapView.dispose(); - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); } if (caseVerifyPresenter != null) { caseVerifyPresenter.disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 14b04ff..392897c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -13,10 +13,11 @@ import com.casic.dcms.adapter.CaseHandledAdapter; import com.casic.dcms.base.AndroidxBaseFragment; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandledPresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandledView; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,12 +29,12 @@ import java.util.ArrayList; import java.util.List; -public class CaseHandledFragment extends AndroidxBaseFragment implements ICaseListHandledView { +public class CaseHandledFragment extends AndroidxBaseFragment implements IHandleCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; private int pageIndex = 1; - private CaseListHandledPresenterImpl caseHandledListPresenter; + private HandleCasePresenterImpl handledCasePresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -46,8 +47,8 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseListHandledPresenterImpl(this); - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter = new HandleCasePresenterImpl(this); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -59,7 +60,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -67,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); } @@ -97,7 +98,7 @@ handledFragment.isRefresh = true; //刷新之后页码重置 handledFragment.pageIndex = 1; - handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + handledFragment.handledCasePresenter.onReadyRetrofitRequest(handledFragment.pageIndex); } else if (msg.what == 202104288) { if (handledFragment.isRefresh || handledFragment.isLoadMore) { handledFragment.adapter.notifyDataSetChanged(); @@ -126,7 +127,12 @@ } @Override - public void obtainCaseHandledList(CaseHandledBean resultBean) { + public void obtainHandleResult(CaseHandleBean resultBean) { + + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -150,8 +156,8 @@ @Override public void onDestroyView() { - if (caseHandledListPresenter != null) { - caseHandledListPresenter.disposeRetrofitRequest(); + if (handledCasePresenter != null) { + handledCasePresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java new file mode 100644 index 0000000..2176313 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java @@ -0,0 +1,169 @@ +package com.casic.dcms.ui.fragment.handle; + +import android.content.Context; +import android.content.Intent; +import android.os.Handler; +import android.os.Message; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.base.AndroidxBaseFragment; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.databinding.FragmentHandleCaseBinding; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; +import com.casic.dcms.ui.CaseHandleDetailActivity; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +public class CaseOverTimeFragment extends AndroidxBaseFragment implements IHandleCaseView { + + private static final String TAG = "OvertimeCaseFragment"; + private Context context; + private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private boolean isRefresh, isLoadMore = false; + private HandleCasePresenterImpl handleCasePresenter; + private CaseHandleAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + handleCasePresenter = new HandleCasePresenterImpl(this); + /** + * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 + * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 + */ + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + pageIndex = 1; + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + } + }); + viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + } + }); + } + + /** + * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private final WeakReference reference; + + private WeakReferenceHandler(CaseOverTimeFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseOverTimeFragment overtimeCaseFragment = reference.get(); + if (msg.what == Constant.CASE_HANDLE_OK) { + Log.d(TAG, "超时案卷处理成功，更新列表"); + overtimeCaseFragment.isRefresh = true; + //刷新之后页码重置 + overtimeCaseFragment.pageIndex = 1; + overtimeCaseFragment.handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.viewBinding.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.viewBinding.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainHandleResult(CaseHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + viewBinding.refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + viewBinding.refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(202104285); + } + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override + public void onDestroyView() { + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); + } + super.onDestroyView(); + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 473cf44..b6930fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -14,9 +14,10 @@ import com.casic.dcms.base.AndroidxBaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,14 +29,14 @@ import java.util.ArrayList; import java.util.List; -public class CaseTodoFragment extends AndroidxBaseFragment implements ICaseListHandleView { +public class CaseTodoFragment extends AndroidxBaseFragment implements IHandleCaseView { private static final String TAG = "CaseTodoFragment"; private Context context; private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseListHandlePresenterImpl caseHandleListPresenter; + private HandleCasePresenterImpl handleCasePresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -46,12 +47,12 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); + handleCasePresenter = new HandleCasePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 */ - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +64,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +72,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); } }); } @@ -101,7 +102,7 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); } else if (msg.what == 202104287) { if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { caseTodoFragment.adapter.notifyDataSetChanged(); @@ -131,7 +132,7 @@ } @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { + public void obtainHandleResult(CaseHandleBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,9 +155,14 @@ } @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override public void onDestroyView() { - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java deleted file mode 100644 index 2e0d2bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.listener.OnGetCaseHandledListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandledListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandledPresenter; -import com.casic.dcms.mvp.view.ICaseListHandledView; - -public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, - OnGetCaseHandledListListener { - - private final ICaseListHandledView view; - private final CaseHandledListModelImpl actionModel; - - public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendCaseHandledListRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandledBean resultBean) { - view.obtainCaseHandledList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java new file mode 100644 index 0000000..3b8b01b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.HandleCaseModelImpl; +import com.casic.dcms.mvp.presenter.IHandleCasePresenter; +import com.casic.dcms.mvp.view.IHandleCaseView; + +public class HandleCasePresenterImpl extends BasePresenter implements IHandleCasePresenter, OnGetCaseHandleListListener { + + private final IHandleCaseView view; + private final HandleCaseModelImpl actionModel; + + public HandleCasePresenterImpl(IHandleCaseView handleCaseView) { + this.view = handleCaseView; + actionModel = new HandleCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.handleCase(isOvertime, isEmergent, limit, offset)); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.handleCase(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseHandleBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onSuccess(CaseHandledBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java deleted file mode 100644 index d7a89ec..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseListHandleView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java new file mode 100644 index 0000000..436339c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java @@ -0,0 +1,10 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; + +public interface IHandleCaseView { + void obtainHandleResult(CaseHandleBean resultBean); + + void obtainHandleResult(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 2e5ac22..9124331 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.databinding.ActivityCaseHandleBinding; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ @Override protected void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new OvertimeCaseFragment()); - fragmentList.add(new UrgentCaseFragment()); + fragmentList.add(new CaseOverTimeFragment()); + fragmentList.add(new CaseUrgentFragment()); fragmentList.add(new CaseTodoFragment()); fragmentList.add(new CaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), pageTitles, fragmentList); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index be3d75a..86bc63f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -28,9 +28,9 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseTimeoutFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -336,11 +336,11 @@ ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); switch (title) { case "超时案卷": - OvertimeCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseTimeoutFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "紧急案卷": - UrgentCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseUrgentFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "待办案卷": 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 c097722..1369d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -19,14 +19,15 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; 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.HandleCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; @@ -54,10 +55,10 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, IVerifyCaseView, ICheckCaseView { + IHandleCaseView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; - private CaseListHandlePresenterImpl caseHandleListPresenter; + private HandleCasePresenterImpl handleCasePresenter; private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -93,12 +94,12 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); viewBinding.mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); + handleCasePresenter = new HandleCasePresenterImpl(this); caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); //Marker相关Layer graphicsOverlays = viewBinding.mapView.getGraphicsOverlays(); @@ -211,7 +212,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); break; case 1: viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -238,8 +239,7 @@ * 处理中 */ @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); + public void obtainHandleResult(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -265,6 +265,11 @@ } } + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + /** * 关联Marker和案卷 * @@ -390,8 +395,8 @@ @Override protected void onDestroy() { viewBinding.mapView.dispose(); - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); } if (caseVerifyPresenter != null) { caseVerifyPresenter.disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 14b04ff..392897c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -13,10 +13,11 @@ import com.casic.dcms.adapter.CaseHandledAdapter; import com.casic.dcms.base.AndroidxBaseFragment; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandledPresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandledView; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,12 +29,12 @@ import java.util.ArrayList; import java.util.List; -public class CaseHandledFragment extends AndroidxBaseFragment implements ICaseListHandledView { +public class CaseHandledFragment extends AndroidxBaseFragment implements IHandleCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; private int pageIndex = 1; - private CaseListHandledPresenterImpl caseHandledListPresenter; + private HandleCasePresenterImpl handledCasePresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -46,8 +47,8 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseListHandledPresenterImpl(this); - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter = new HandleCasePresenterImpl(this); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -59,7 +60,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -67,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); } @@ -97,7 +98,7 @@ handledFragment.isRefresh = true; //刷新之后页码重置 handledFragment.pageIndex = 1; - handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + handledFragment.handledCasePresenter.onReadyRetrofitRequest(handledFragment.pageIndex); } else if (msg.what == 202104288) { if (handledFragment.isRefresh || handledFragment.isLoadMore) { handledFragment.adapter.notifyDataSetChanged(); @@ -126,7 +127,12 @@ } @Override - public void obtainCaseHandledList(CaseHandledBean resultBean) { + public void obtainHandleResult(CaseHandleBean resultBean) { + + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -150,8 +156,8 @@ @Override public void onDestroyView() { - if (caseHandledListPresenter != null) { - caseHandledListPresenter.disposeRetrofitRequest(); + if (handledCasePresenter != null) { + handledCasePresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java new file mode 100644 index 0000000..2176313 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java @@ -0,0 +1,169 @@ +package com.casic.dcms.ui.fragment.handle; + +import android.content.Context; +import android.content.Intent; +import android.os.Handler; +import android.os.Message; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.base.AndroidxBaseFragment; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.databinding.FragmentHandleCaseBinding; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; +import com.casic.dcms.ui.CaseHandleDetailActivity; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +public class CaseOverTimeFragment extends AndroidxBaseFragment implements IHandleCaseView { + + private static final String TAG = "OvertimeCaseFragment"; + private Context context; + private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private boolean isRefresh, isLoadMore = false; + private HandleCasePresenterImpl handleCasePresenter; + private CaseHandleAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + handleCasePresenter = new HandleCasePresenterImpl(this); + /** + * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 + * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 + */ + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + pageIndex = 1; + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + } + }); + viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + } + }); + } + + /** + * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private final WeakReference reference; + + private WeakReferenceHandler(CaseOverTimeFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseOverTimeFragment overtimeCaseFragment = reference.get(); + if (msg.what == Constant.CASE_HANDLE_OK) { + Log.d(TAG, "超时案卷处理成功，更新列表"); + overtimeCaseFragment.isRefresh = true; + //刷新之后页码重置 + overtimeCaseFragment.pageIndex = 1; + overtimeCaseFragment.handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.viewBinding.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.viewBinding.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainHandleResult(CaseHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + viewBinding.refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + viewBinding.refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(202104285); + } + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override + public void onDestroyView() { + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); + } + super.onDestroyView(); + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 473cf44..b6930fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -14,9 +14,10 @@ import com.casic.dcms.base.AndroidxBaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,14 +29,14 @@ import java.util.ArrayList; import java.util.List; -public class CaseTodoFragment extends AndroidxBaseFragment implements ICaseListHandleView { +public class CaseTodoFragment extends AndroidxBaseFragment implements IHandleCaseView { private static final String TAG = "CaseTodoFragment"; private Context context; private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseListHandlePresenterImpl caseHandleListPresenter; + private HandleCasePresenterImpl handleCasePresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -46,12 +47,12 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); + handleCasePresenter = new HandleCasePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 */ - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +64,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +72,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); } }); } @@ -101,7 +102,7 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); } else if (msg.what == 202104287) { if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { caseTodoFragment.adapter.notifyDataSetChanged(); @@ -131,7 +132,7 @@ } @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { + public void obtainHandleResult(CaseHandleBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,9 +155,14 @@ } @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override public void onDestroyView() { - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseUrgentFragment.java new file mode 100644 index 0000000..39d7099 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseUrgentFragment.java @@ -0,0 +1,169 @@ +package com.casic.dcms.ui.fragment.handle; + +import android.content.Context; +import android.content.Intent; +import android.os.Handler; +import android.os.Message; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.base.AndroidxBaseFragment; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.databinding.FragmentHandleCaseBinding; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; +import com.casic.dcms.ui.CaseHandleDetailActivity; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +public class CaseUrgentFragment extends AndroidxBaseFragment implements IHandleCaseView { + + private static final String TAG = "UrgentCaseFragment"; + private Context context; + private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private boolean isRefresh, isLoadMore = false; + private HandleCasePresenterImpl handleCasePresenter; + private CaseHandleAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + handleCasePresenter = new HandleCasePresenterImpl(this); + /** + * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 + * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 + */ + handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + pageIndex = 1; + handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); + } + }); + viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); + } + }); + } + + /** + * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private final WeakReference reference; + + private WeakReferenceHandler(CaseUrgentFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseUrgentFragment urgentCaseFragment = reference.get(); + if (msg.what == Constant.CASE_HANDLE_OK) { + Log.d(TAG, "紧急案卷处理成功，更新列表"); + urgentCaseFragment.isRefresh = true; + //刷新之后页码重置 + urgentCaseFragment.pageIndex = 1; + urgentCaseFragment.handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + } else if (msg.what == 202104286) { + if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { + urgentCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (urgentCaseFragment.dataBeans.size() == 0) { + urgentCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); + } else { + urgentCaseFragment.viewBinding.emptyView.hide(); + urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); + urgentCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); + urgentCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); + urgentCaseFragment.viewBinding.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); + urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); + urgentCaseFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainHandleResult(CaseHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + viewBinding.refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + viewBinding.refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(202104286); + } + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override + public void onDestroyView() { + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); + } + super.onDestroyView(); + } +} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java deleted file mode 100644 index 2e0d2bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.listener.OnGetCaseHandledListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandledListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandledPresenter; -import com.casic.dcms.mvp.view.ICaseListHandledView; - -public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, - OnGetCaseHandledListListener { - - private final ICaseListHandledView view; - private final CaseHandledListModelImpl actionModel; - - public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendCaseHandledListRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandledBean resultBean) { - view.obtainCaseHandledList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java new file mode 100644 index 0000000..3b8b01b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.HandleCaseModelImpl; +import com.casic.dcms.mvp.presenter.IHandleCasePresenter; +import com.casic.dcms.mvp.view.IHandleCaseView; + +public class HandleCasePresenterImpl extends BasePresenter implements IHandleCasePresenter, OnGetCaseHandleListListener { + + private final IHandleCaseView view; + private final HandleCaseModelImpl actionModel; + + public HandleCasePresenterImpl(IHandleCaseView handleCaseView) { + this.view = handleCaseView; + actionModel = new HandleCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.handleCase(isOvertime, isEmergent, limit, offset)); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.handleCase(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseHandleBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onSuccess(CaseHandledBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java deleted file mode 100644 index d7a89ec..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseListHandleView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java new file mode 100644 index 0000000..436339c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java @@ -0,0 +1,10 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; + +public interface IHandleCaseView { + void obtainHandleResult(CaseHandleBean resultBean); + + void obtainHandleResult(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 2e5ac22..9124331 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.databinding.ActivityCaseHandleBinding; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ @Override protected void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new OvertimeCaseFragment()); - fragmentList.add(new UrgentCaseFragment()); + fragmentList.add(new CaseOverTimeFragment()); + fragmentList.add(new CaseUrgentFragment()); fragmentList.add(new CaseTodoFragment()); fragmentList.add(new CaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), pageTitles, fragmentList); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index be3d75a..86bc63f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -28,9 +28,9 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseTimeoutFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -336,11 +336,11 @@ ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); switch (title) { case "超时案卷": - OvertimeCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseTimeoutFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "紧急案卷": - UrgentCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseUrgentFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "待办案卷": 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 c097722..1369d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -19,14 +19,15 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; 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.HandleCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; @@ -54,10 +55,10 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, IVerifyCaseView, ICheckCaseView { + IHandleCaseView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; - private CaseListHandlePresenterImpl caseHandleListPresenter; + private HandleCasePresenterImpl handleCasePresenter; private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -93,12 +94,12 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); viewBinding.mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); + handleCasePresenter = new HandleCasePresenterImpl(this); caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); //Marker相关Layer graphicsOverlays = viewBinding.mapView.getGraphicsOverlays(); @@ -211,7 +212,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); break; case 1: viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -238,8 +239,7 @@ * 处理中 */ @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); + public void obtainHandleResult(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -265,6 +265,11 @@ } } + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + /** * 关联Marker和案卷 * @@ -390,8 +395,8 @@ @Override protected void onDestroy() { viewBinding.mapView.dispose(); - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); } if (caseVerifyPresenter != null) { caseVerifyPresenter.disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 14b04ff..392897c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -13,10 +13,11 @@ import com.casic.dcms.adapter.CaseHandledAdapter; import com.casic.dcms.base.AndroidxBaseFragment; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandledPresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandledView; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,12 +29,12 @@ import java.util.ArrayList; import java.util.List; -public class CaseHandledFragment extends AndroidxBaseFragment implements ICaseListHandledView { +public class CaseHandledFragment extends AndroidxBaseFragment implements IHandleCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; private int pageIndex = 1; - private CaseListHandledPresenterImpl caseHandledListPresenter; + private HandleCasePresenterImpl handledCasePresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -46,8 +47,8 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseListHandledPresenterImpl(this); - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter = new HandleCasePresenterImpl(this); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -59,7 +60,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -67,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); } @@ -97,7 +98,7 @@ handledFragment.isRefresh = true; //刷新之后页码重置 handledFragment.pageIndex = 1; - handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + handledFragment.handledCasePresenter.onReadyRetrofitRequest(handledFragment.pageIndex); } else if (msg.what == 202104288) { if (handledFragment.isRefresh || handledFragment.isLoadMore) { handledFragment.adapter.notifyDataSetChanged(); @@ -126,7 +127,12 @@ } @Override - public void obtainCaseHandledList(CaseHandledBean resultBean) { + public void obtainHandleResult(CaseHandleBean resultBean) { + + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -150,8 +156,8 @@ @Override public void onDestroyView() { - if (caseHandledListPresenter != null) { - caseHandledListPresenter.disposeRetrofitRequest(); + if (handledCasePresenter != null) { + handledCasePresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java new file mode 100644 index 0000000..2176313 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java @@ -0,0 +1,169 @@ +package com.casic.dcms.ui.fragment.handle; + +import android.content.Context; +import android.content.Intent; +import android.os.Handler; +import android.os.Message; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.base.AndroidxBaseFragment; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.databinding.FragmentHandleCaseBinding; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; +import com.casic.dcms.ui.CaseHandleDetailActivity; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +public class CaseOverTimeFragment extends AndroidxBaseFragment implements IHandleCaseView { + + private static final String TAG = "OvertimeCaseFragment"; + private Context context; + private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private boolean isRefresh, isLoadMore = false; + private HandleCasePresenterImpl handleCasePresenter; + private CaseHandleAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + handleCasePresenter = new HandleCasePresenterImpl(this); + /** + * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 + * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 + */ + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + pageIndex = 1; + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + } + }); + viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + } + }); + } + + /** + * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private final WeakReference reference; + + private WeakReferenceHandler(CaseOverTimeFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseOverTimeFragment overtimeCaseFragment = reference.get(); + if (msg.what == Constant.CASE_HANDLE_OK) { + Log.d(TAG, "超时案卷处理成功，更新列表"); + overtimeCaseFragment.isRefresh = true; + //刷新之后页码重置 + overtimeCaseFragment.pageIndex = 1; + overtimeCaseFragment.handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.viewBinding.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.viewBinding.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainHandleResult(CaseHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + viewBinding.refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + viewBinding.refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(202104285); + } + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override + public void onDestroyView() { + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); + } + super.onDestroyView(); + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 473cf44..b6930fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -14,9 +14,10 @@ import com.casic.dcms.base.AndroidxBaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,14 +29,14 @@ import java.util.ArrayList; import java.util.List; -public class CaseTodoFragment extends AndroidxBaseFragment implements ICaseListHandleView { +public class CaseTodoFragment extends AndroidxBaseFragment implements IHandleCaseView { private static final String TAG = "CaseTodoFragment"; private Context context; private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseListHandlePresenterImpl caseHandleListPresenter; + private HandleCasePresenterImpl handleCasePresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -46,12 +47,12 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); + handleCasePresenter = new HandleCasePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 */ - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +64,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +72,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); } }); } @@ -101,7 +102,7 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); } else if (msg.what == 202104287) { if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { caseTodoFragment.adapter.notifyDataSetChanged(); @@ -131,7 +132,7 @@ } @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { + public void obtainHandleResult(CaseHandleBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,9 +155,14 @@ } @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override public void onDestroyView() { - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseUrgentFragment.java new file mode 100644 index 0000000..39d7099 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseUrgentFragment.java @@ -0,0 +1,169 @@ +package com.casic.dcms.ui.fragment.handle; + +import android.content.Context; +import android.content.Intent; +import android.os.Handler; +import android.os.Message; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.base.AndroidxBaseFragment; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.databinding.FragmentHandleCaseBinding; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; +import com.casic.dcms.ui.CaseHandleDetailActivity; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +public class CaseUrgentFragment extends AndroidxBaseFragment implements IHandleCaseView { + + private static final String TAG = "UrgentCaseFragment"; + private Context context; + private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private boolean isRefresh, isLoadMore = false; + private HandleCasePresenterImpl handleCasePresenter; + private CaseHandleAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + handleCasePresenter = new HandleCasePresenterImpl(this); + /** + * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 + * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 + */ + handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + pageIndex = 1; + handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); + } + }); + viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); + } + }); + } + + /** + * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private final WeakReference reference; + + private WeakReferenceHandler(CaseUrgentFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseUrgentFragment urgentCaseFragment = reference.get(); + if (msg.what == Constant.CASE_HANDLE_OK) { + Log.d(TAG, "紧急案卷处理成功，更新列表"); + urgentCaseFragment.isRefresh = true; + //刷新之后页码重置 + urgentCaseFragment.pageIndex = 1; + urgentCaseFragment.handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + } else if (msg.what == 202104286) { + if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { + urgentCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (urgentCaseFragment.dataBeans.size() == 0) { + urgentCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); + } else { + urgentCaseFragment.viewBinding.emptyView.hide(); + urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); + urgentCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); + urgentCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); + urgentCaseFragment.viewBinding.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); + urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); + urgentCaseFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainHandleResult(CaseHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + viewBinding.refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + viewBinding.refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(202104286); + } + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override + public void onDestroyView() { + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); + } + super.onDestroyView(); + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java deleted file mode 100644 index aa188ce..0000000 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.casic.dcms.ui.fragment.handle; - -import android.content.Context; -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.LinearLayoutManager; - -import com.casic.dcms.adapter.CaseHandleAdapter; -import com.casic.dcms.base.AndroidxBaseFragment; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.ui.CaseHandleDetailActivity; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ToastHelper; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.List; - -public class OvertimeCaseFragment extends AndroidxBaseFragment implements ICaseListHandleView { - - private static final String TAG = "OvertimeCaseFragment"; - private Context context; - private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); - private boolean isRefresh, isLoadMore = false; - private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseHandleAdapter adapter; - private static WeakReferenceHandler weakReferenceHandler; - - @Override - protected void setupTopBarLayout() { - context = getContext(); - } - - @Override - protected void initData() { - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); - - weakReferenceHandler = new WeakReferenceHandler(this); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); - } - }); - } - - /** - * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 - */ - public static void sendEmptyMessage(int what) { - if (weakReferenceHandler == null) { - return; - } - weakReferenceHandler.sendEmptyMessage(what); - } - - private static class WeakReferenceHandler extends Handler { - private final WeakReference reference; - - private WeakReferenceHandler(OvertimeCaseFragment fragment) { - reference = new WeakReference<>(fragment); - } - - @Override - public void handleMessage(Message msg) { - OvertimeCaseFragment overtimeCaseFragment = reference.get(); - if (msg.what == Constant.CASE_HANDLE_OK) { - Log.d(TAG, "超时案卷处理成功，更新列表"); - overtimeCaseFragment.isRefresh = true; - //刷新之后页码重置 - overtimeCaseFragment.pageIndex = 1; - overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); - } else if (msg.what == 202104285) { - if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { - overtimeCaseFragment.adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (overtimeCaseFragment.dataBeans.size() == 0) { - overtimeCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); - } else { - overtimeCaseFragment.viewBinding.emptyView.hide(); - overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); - overtimeCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); - overtimeCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); - overtimeCaseFragment.viewBinding.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); - overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); - overtimeCaseFragment.startActivity(intent); - } - }); - } - } - } - } - } - - @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); - if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); - } - dataBeans.addAll(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - } - weakReferenceHandler.sendEmptyMessage(202104285); - } - } - - @Override - public void onDestroyView() { - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); - } - super.onDestroyView(); - } -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java deleted file mode 100644 index 2e0d2bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.listener.OnGetCaseHandledListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandledListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandledPresenter; -import com.casic.dcms.mvp.view.ICaseListHandledView; - -public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, - OnGetCaseHandledListListener { - - private final ICaseListHandledView view; - private final CaseHandledListModelImpl actionModel; - - public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendCaseHandledListRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandledBean resultBean) { - view.obtainCaseHandledList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java new file mode 100644 index 0000000..3b8b01b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.HandleCaseModelImpl; +import com.casic.dcms.mvp.presenter.IHandleCasePresenter; +import com.casic.dcms.mvp.view.IHandleCaseView; + +public class HandleCasePresenterImpl extends BasePresenter implements IHandleCasePresenter, OnGetCaseHandleListListener { + + private final IHandleCaseView view; + private final HandleCaseModelImpl actionModel; + + public HandleCasePresenterImpl(IHandleCaseView handleCaseView) { + this.view = handleCaseView; + actionModel = new HandleCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.handleCase(isOvertime, isEmergent, limit, offset)); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.handleCase(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseHandleBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onSuccess(CaseHandledBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java deleted file mode 100644 index d7a89ec..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseListHandleView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java new file mode 100644 index 0000000..436339c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java @@ -0,0 +1,10 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; + +public interface IHandleCaseView { + void obtainHandleResult(CaseHandleBean resultBean); + + void obtainHandleResult(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 2e5ac22..9124331 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.databinding.ActivityCaseHandleBinding; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ @Override protected void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new OvertimeCaseFragment()); - fragmentList.add(new UrgentCaseFragment()); + fragmentList.add(new CaseOverTimeFragment()); + fragmentList.add(new CaseUrgentFragment()); fragmentList.add(new CaseTodoFragment()); fragmentList.add(new CaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), pageTitles, fragmentList); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index be3d75a..86bc63f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -28,9 +28,9 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseTimeoutFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -336,11 +336,11 @@ ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); switch (title) { case "超时案卷": - OvertimeCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseTimeoutFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "紧急案卷": - UrgentCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseUrgentFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "待办案卷": 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 c097722..1369d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -19,14 +19,15 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; 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.HandleCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; @@ -54,10 +55,10 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, IVerifyCaseView, ICheckCaseView { + IHandleCaseView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; - private CaseListHandlePresenterImpl caseHandleListPresenter; + private HandleCasePresenterImpl handleCasePresenter; private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -93,12 +94,12 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); viewBinding.mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); + handleCasePresenter = new HandleCasePresenterImpl(this); caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); //Marker相关Layer graphicsOverlays = viewBinding.mapView.getGraphicsOverlays(); @@ -211,7 +212,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); break; case 1: viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -238,8 +239,7 @@ * 处理中 */ @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); + public void obtainHandleResult(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -265,6 +265,11 @@ } } + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + /** * 关联Marker和案卷 * @@ -390,8 +395,8 @@ @Override protected void onDestroy() { viewBinding.mapView.dispose(); - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); } if (caseVerifyPresenter != null) { caseVerifyPresenter.disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 14b04ff..392897c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -13,10 +13,11 @@ import com.casic.dcms.adapter.CaseHandledAdapter; import com.casic.dcms.base.AndroidxBaseFragment; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandledPresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandledView; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,12 +29,12 @@ import java.util.ArrayList; import java.util.List; -public class CaseHandledFragment extends AndroidxBaseFragment implements ICaseListHandledView { +public class CaseHandledFragment extends AndroidxBaseFragment implements IHandleCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; private int pageIndex = 1; - private CaseListHandledPresenterImpl caseHandledListPresenter; + private HandleCasePresenterImpl handledCasePresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -46,8 +47,8 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseListHandledPresenterImpl(this); - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter = new HandleCasePresenterImpl(this); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -59,7 +60,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -67,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); } @@ -97,7 +98,7 @@ handledFragment.isRefresh = true; //刷新之后页码重置 handledFragment.pageIndex = 1; - handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + handledFragment.handledCasePresenter.onReadyRetrofitRequest(handledFragment.pageIndex); } else if (msg.what == 202104288) { if (handledFragment.isRefresh || handledFragment.isLoadMore) { handledFragment.adapter.notifyDataSetChanged(); @@ -126,7 +127,12 @@ } @Override - public void obtainCaseHandledList(CaseHandledBean resultBean) { + public void obtainHandleResult(CaseHandleBean resultBean) { + + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -150,8 +156,8 @@ @Override public void onDestroyView() { - if (caseHandledListPresenter != null) { - caseHandledListPresenter.disposeRetrofitRequest(); + if (handledCasePresenter != null) { + handledCasePresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java new file mode 100644 index 0000000..2176313 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java @@ -0,0 +1,169 @@ +package com.casic.dcms.ui.fragment.handle; + +import android.content.Context; +import android.content.Intent; +import android.os.Handler; +import android.os.Message; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.base.AndroidxBaseFragment; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.databinding.FragmentHandleCaseBinding; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; +import com.casic.dcms.ui.CaseHandleDetailActivity; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +public class CaseOverTimeFragment extends AndroidxBaseFragment implements IHandleCaseView { + + private static final String TAG = "OvertimeCaseFragment"; + private Context context; + private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private boolean isRefresh, isLoadMore = false; + private HandleCasePresenterImpl handleCasePresenter; + private CaseHandleAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + handleCasePresenter = new HandleCasePresenterImpl(this); + /** + * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 + * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 + */ + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + pageIndex = 1; + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + } + }); + viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + } + }); + } + + /** + * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private final WeakReference reference; + + private WeakReferenceHandler(CaseOverTimeFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseOverTimeFragment overtimeCaseFragment = reference.get(); + if (msg.what == Constant.CASE_HANDLE_OK) { + Log.d(TAG, "超时案卷处理成功，更新列表"); + overtimeCaseFragment.isRefresh = true; + //刷新之后页码重置 + overtimeCaseFragment.pageIndex = 1; + overtimeCaseFragment.handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.viewBinding.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.viewBinding.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainHandleResult(CaseHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + viewBinding.refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + viewBinding.refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(202104285); + } + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override + public void onDestroyView() { + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); + } + super.onDestroyView(); + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 473cf44..b6930fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -14,9 +14,10 @@ import com.casic.dcms.base.AndroidxBaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,14 +29,14 @@ import java.util.ArrayList; import java.util.List; -public class CaseTodoFragment extends AndroidxBaseFragment implements ICaseListHandleView { +public class CaseTodoFragment extends AndroidxBaseFragment implements IHandleCaseView { private static final String TAG = "CaseTodoFragment"; private Context context; private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseListHandlePresenterImpl caseHandleListPresenter; + private HandleCasePresenterImpl handleCasePresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -46,12 +47,12 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); + handleCasePresenter = new HandleCasePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 */ - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +64,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +72,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); } }); } @@ -101,7 +102,7 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); } else if (msg.what == 202104287) { if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { caseTodoFragment.adapter.notifyDataSetChanged(); @@ -131,7 +132,7 @@ } @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { + public void obtainHandleResult(CaseHandleBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,9 +155,14 @@ } @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override public void onDestroyView() { - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseUrgentFragment.java new file mode 100644 index 0000000..39d7099 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseUrgentFragment.java @@ -0,0 +1,169 @@ +package com.casic.dcms.ui.fragment.handle; + +import android.content.Context; +import android.content.Intent; +import android.os.Handler; +import android.os.Message; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.base.AndroidxBaseFragment; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.databinding.FragmentHandleCaseBinding; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; +import com.casic.dcms.ui.CaseHandleDetailActivity; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +public class CaseUrgentFragment extends AndroidxBaseFragment implements IHandleCaseView { + + private static final String TAG = "UrgentCaseFragment"; + private Context context; + private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private boolean isRefresh, isLoadMore = false; + private HandleCasePresenterImpl handleCasePresenter; + private CaseHandleAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + handleCasePresenter = new HandleCasePresenterImpl(this); + /** + * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 + * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 + */ + handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + pageIndex = 1; + handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); + } + }); + viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); + } + }); + } + + /** + * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private final WeakReference reference; + + private WeakReferenceHandler(CaseUrgentFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseUrgentFragment urgentCaseFragment = reference.get(); + if (msg.what == Constant.CASE_HANDLE_OK) { + Log.d(TAG, "紧急案卷处理成功，更新列表"); + urgentCaseFragment.isRefresh = true; + //刷新之后页码重置 + urgentCaseFragment.pageIndex = 1; + urgentCaseFragment.handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + } else if (msg.what == 202104286) { + if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { + urgentCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (urgentCaseFragment.dataBeans.size() == 0) { + urgentCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); + } else { + urgentCaseFragment.viewBinding.emptyView.hide(); + urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); + urgentCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); + urgentCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); + urgentCaseFragment.viewBinding.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); + urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); + urgentCaseFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainHandleResult(CaseHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + viewBinding.refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + viewBinding.refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(202104286); + } + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override + public void onDestroyView() { + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); + } + super.onDestroyView(); + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java deleted file mode 100644 index aa188ce..0000000 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.casic.dcms.ui.fragment.handle; - -import android.content.Context; -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.LinearLayoutManager; - -import com.casic.dcms.adapter.CaseHandleAdapter; -import com.casic.dcms.base.AndroidxBaseFragment; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.ui.CaseHandleDetailActivity; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ToastHelper; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.List; - -public class OvertimeCaseFragment extends AndroidxBaseFragment implements ICaseListHandleView { - - private static final String TAG = "OvertimeCaseFragment"; - private Context context; - private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); - private boolean isRefresh, isLoadMore = false; - private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseHandleAdapter adapter; - private static WeakReferenceHandler weakReferenceHandler; - - @Override - protected void setupTopBarLayout() { - context = getContext(); - } - - @Override - protected void initData() { - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); - - weakReferenceHandler = new WeakReferenceHandler(this); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); - } - }); - } - - /** - * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 - */ - public static void sendEmptyMessage(int what) { - if (weakReferenceHandler == null) { - return; - } - weakReferenceHandler.sendEmptyMessage(what); - } - - private static class WeakReferenceHandler extends Handler { - private final WeakReference reference; - - private WeakReferenceHandler(OvertimeCaseFragment fragment) { - reference = new WeakReference<>(fragment); - } - - @Override - public void handleMessage(Message msg) { - OvertimeCaseFragment overtimeCaseFragment = reference.get(); - if (msg.what == Constant.CASE_HANDLE_OK) { - Log.d(TAG, "超时案卷处理成功，更新列表"); - overtimeCaseFragment.isRefresh = true; - //刷新之后页码重置 - overtimeCaseFragment.pageIndex = 1; - overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); - } else if (msg.what == 202104285) { - if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { - overtimeCaseFragment.adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (overtimeCaseFragment.dataBeans.size() == 0) { - overtimeCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); - } else { - overtimeCaseFragment.viewBinding.emptyView.hide(); - overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); - overtimeCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); - overtimeCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); - overtimeCaseFragment.viewBinding.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); - overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); - overtimeCaseFragment.startActivity(intent); - } - }); - } - } - } - } - } - - @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); - if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); - } - dataBeans.addAll(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - } - weakReferenceHandler.sendEmptyMessage(202104285); - } - } - - @Override - public void onDestroyView() { - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); - } - super.onDestroyView(); - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java deleted file mode 100644 index 3cac559..0000000 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.casic.dcms.ui.fragment.handle; - -import android.content.Context; -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.LinearLayoutManager; - -import com.casic.dcms.adapter.CaseHandleAdapter; -import com.casic.dcms.base.AndroidxBaseFragment; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.ui.CaseHandleDetailActivity; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ToastHelper; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.List; - -public class UrgentCaseFragment extends AndroidxBaseFragment implements ICaseListHandleView { - - private static final String TAG = "UrgentCaseFragment"; - private Context context; - private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); - private boolean isRefresh, isLoadMore = false; - private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseHandleAdapter adapter; - private static WeakReferenceHandler weakReferenceHandler; - - @Override - protected void setupTopBarLayout() { - context = getContext(); - } - - @Override - protected void initData() { - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); - - weakReferenceHandler = new WeakReferenceHandler(this); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); - } - }); - } - - /** - * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 - */ - public static void sendEmptyMessage(int what) { - if (weakReferenceHandler == null) { - return; - } - weakReferenceHandler.sendEmptyMessage(what); - } - - private static class WeakReferenceHandler extends Handler { - private final WeakReference reference; - - private WeakReferenceHandler(UrgentCaseFragment fragment) { - reference = new WeakReference<>(fragment); - } - - @Override - public void handleMessage(Message msg) { - UrgentCaseFragment urgentCaseFragment = reference.get(); - if (msg.what == Constant.CASE_HANDLE_OK) { - Log.d(TAG, "紧急案卷处理成功，更新列表"); - urgentCaseFragment.isRefresh = true; - //刷新之后页码重置 - urgentCaseFragment.pageIndex = 1; - urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); - } else if (msg.what == 202104286) { - if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { - urgentCaseFragment.adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (urgentCaseFragment.dataBeans.size() == 0) { - urgentCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); - } else { - urgentCaseFragment.viewBinding.emptyView.hide(); - urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); - urgentCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); - urgentCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); - urgentCaseFragment.viewBinding.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); - urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); - urgentCaseFragment.startActivity(intent); - } - }); - } - } - } - } - } - - @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainUrgentCaseList: " + new Gson().toJson(resultBean)); - if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); - } - dataBeans.addAll(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - } - weakReferenceHandler.sendEmptyMessage(202104286); - } - } - - @Override - public void onDestroyView() { - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); - } - super.onDestroyView(); - } -} diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java deleted file mode 100644 index 2e0d2bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.listener.OnGetCaseHandledListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandledListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandledPresenter; -import com.casic.dcms.mvp.view.ICaseListHandledView; - -public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, - OnGetCaseHandledListListener { - - private final ICaseListHandledView view; - private final CaseHandledListModelImpl actionModel; - - public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendCaseHandledListRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandledBean resultBean) { - view.obtainCaseHandledList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java new file mode 100644 index 0000000..3b8b01b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.HandleCaseModelImpl; +import com.casic.dcms.mvp.presenter.IHandleCasePresenter; +import com.casic.dcms.mvp.view.IHandleCaseView; + +public class HandleCasePresenterImpl extends BasePresenter implements IHandleCasePresenter, OnGetCaseHandleListListener { + + private final IHandleCaseView view; + private final HandleCaseModelImpl actionModel; + + public HandleCasePresenterImpl(IHandleCaseView handleCaseView) { + this.view = handleCaseView; + actionModel = new HandleCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.handleCase(isOvertime, isEmergent, limit, offset)); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.handleCase(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseHandleBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onSuccess(CaseHandledBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java deleted file mode 100644 index d7a89ec..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseListHandleView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java new file mode 100644 index 0000000..436339c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java @@ -0,0 +1,10 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; + +public interface IHandleCaseView { + void obtainHandleResult(CaseHandleBean resultBean); + + void obtainHandleResult(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 2e5ac22..9124331 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.databinding.ActivityCaseHandleBinding; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ @Override protected void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new OvertimeCaseFragment()); - fragmentList.add(new UrgentCaseFragment()); + fragmentList.add(new CaseOverTimeFragment()); + fragmentList.add(new CaseUrgentFragment()); fragmentList.add(new CaseTodoFragment()); fragmentList.add(new CaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), pageTitles, fragmentList); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index be3d75a..86bc63f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -28,9 +28,9 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseTimeoutFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -336,11 +336,11 @@ ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); switch (title) { case "超时案卷": - OvertimeCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseTimeoutFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "紧急案卷": - UrgentCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseUrgentFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "待办案卷": 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 c097722..1369d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -19,14 +19,15 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; 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.HandleCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; @@ -54,10 +55,10 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, IVerifyCaseView, ICheckCaseView { + IHandleCaseView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; - private CaseListHandlePresenterImpl caseHandleListPresenter; + private HandleCasePresenterImpl handleCasePresenter; private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -93,12 +94,12 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); viewBinding.mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); + handleCasePresenter = new HandleCasePresenterImpl(this); caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); //Marker相关Layer graphicsOverlays = viewBinding.mapView.getGraphicsOverlays(); @@ -211,7 +212,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); break; case 1: viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -238,8 +239,7 @@ * 处理中 */ @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); + public void obtainHandleResult(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -265,6 +265,11 @@ } } + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + /** * 关联Marker和案卷 * @@ -390,8 +395,8 @@ @Override protected void onDestroy() { viewBinding.mapView.dispose(); - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); } if (caseVerifyPresenter != null) { caseVerifyPresenter.disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 14b04ff..392897c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -13,10 +13,11 @@ import com.casic.dcms.adapter.CaseHandledAdapter; import com.casic.dcms.base.AndroidxBaseFragment; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandledPresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandledView; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,12 +29,12 @@ import java.util.ArrayList; import java.util.List; -public class CaseHandledFragment extends AndroidxBaseFragment implements ICaseListHandledView { +public class CaseHandledFragment extends AndroidxBaseFragment implements IHandleCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; private int pageIndex = 1; - private CaseListHandledPresenterImpl caseHandledListPresenter; + private HandleCasePresenterImpl handledCasePresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -46,8 +47,8 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseListHandledPresenterImpl(this); - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter = new HandleCasePresenterImpl(this); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -59,7 +60,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -67,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); } @@ -97,7 +98,7 @@ handledFragment.isRefresh = true; //刷新之后页码重置 handledFragment.pageIndex = 1; - handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + handledFragment.handledCasePresenter.onReadyRetrofitRequest(handledFragment.pageIndex); } else if (msg.what == 202104288) { if (handledFragment.isRefresh || handledFragment.isLoadMore) { handledFragment.adapter.notifyDataSetChanged(); @@ -126,7 +127,12 @@ } @Override - public void obtainCaseHandledList(CaseHandledBean resultBean) { + public void obtainHandleResult(CaseHandleBean resultBean) { + + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -150,8 +156,8 @@ @Override public void onDestroyView() { - if (caseHandledListPresenter != null) { - caseHandledListPresenter.disposeRetrofitRequest(); + if (handledCasePresenter != null) { + handledCasePresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java new file mode 100644 index 0000000..2176313 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java @@ -0,0 +1,169 @@ +package com.casic.dcms.ui.fragment.handle; + +import android.content.Context; +import android.content.Intent; +import android.os.Handler; +import android.os.Message; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.base.AndroidxBaseFragment; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.databinding.FragmentHandleCaseBinding; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; +import com.casic.dcms.ui.CaseHandleDetailActivity; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +public class CaseOverTimeFragment extends AndroidxBaseFragment implements IHandleCaseView { + + private static final String TAG = "OvertimeCaseFragment"; + private Context context; + private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private boolean isRefresh, isLoadMore = false; + private HandleCasePresenterImpl handleCasePresenter; + private CaseHandleAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + handleCasePresenter = new HandleCasePresenterImpl(this); + /** + * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 + * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 + */ + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + pageIndex = 1; + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + } + }); + viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + } + }); + } + + /** + * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private final WeakReference reference; + + private WeakReferenceHandler(CaseOverTimeFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseOverTimeFragment overtimeCaseFragment = reference.get(); + if (msg.what == Constant.CASE_HANDLE_OK) { + Log.d(TAG, "超时案卷处理成功，更新列表"); + overtimeCaseFragment.isRefresh = true; + //刷新之后页码重置 + overtimeCaseFragment.pageIndex = 1; + overtimeCaseFragment.handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.viewBinding.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.viewBinding.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainHandleResult(CaseHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + viewBinding.refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + viewBinding.refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(202104285); + } + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override + public void onDestroyView() { + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); + } + super.onDestroyView(); + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 473cf44..b6930fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -14,9 +14,10 @@ import com.casic.dcms.base.AndroidxBaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,14 +29,14 @@ import java.util.ArrayList; import java.util.List; -public class CaseTodoFragment extends AndroidxBaseFragment implements ICaseListHandleView { +public class CaseTodoFragment extends AndroidxBaseFragment implements IHandleCaseView { private static final String TAG = "CaseTodoFragment"; private Context context; private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseListHandlePresenterImpl caseHandleListPresenter; + private HandleCasePresenterImpl handleCasePresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -46,12 +47,12 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); + handleCasePresenter = new HandleCasePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 */ - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +64,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +72,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); } }); } @@ -101,7 +102,7 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); } else if (msg.what == 202104287) { if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { caseTodoFragment.adapter.notifyDataSetChanged(); @@ -131,7 +132,7 @@ } @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { + public void obtainHandleResult(CaseHandleBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,9 +155,14 @@ } @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override public void onDestroyView() { - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseUrgentFragment.java new file mode 100644 index 0000000..39d7099 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseUrgentFragment.java @@ -0,0 +1,169 @@ +package com.casic.dcms.ui.fragment.handle; + +import android.content.Context; +import android.content.Intent; +import android.os.Handler; +import android.os.Message; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.base.AndroidxBaseFragment; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.databinding.FragmentHandleCaseBinding; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; +import com.casic.dcms.ui.CaseHandleDetailActivity; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +public class CaseUrgentFragment extends AndroidxBaseFragment implements IHandleCaseView { + + private static final String TAG = "UrgentCaseFragment"; + private Context context; + private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private boolean isRefresh, isLoadMore = false; + private HandleCasePresenterImpl handleCasePresenter; + private CaseHandleAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + handleCasePresenter = new HandleCasePresenterImpl(this); + /** + * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 + * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 + */ + handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + pageIndex = 1; + handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); + } + }); + viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); + } + }); + } + + /** + * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private final WeakReference reference; + + private WeakReferenceHandler(CaseUrgentFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseUrgentFragment urgentCaseFragment = reference.get(); + if (msg.what == Constant.CASE_HANDLE_OK) { + Log.d(TAG, "紧急案卷处理成功，更新列表"); + urgentCaseFragment.isRefresh = true; + //刷新之后页码重置 + urgentCaseFragment.pageIndex = 1; + urgentCaseFragment.handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + } else if (msg.what == 202104286) { + if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { + urgentCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (urgentCaseFragment.dataBeans.size() == 0) { + urgentCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); + } else { + urgentCaseFragment.viewBinding.emptyView.hide(); + urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); + urgentCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); + urgentCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); + urgentCaseFragment.viewBinding.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); + urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); + urgentCaseFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainHandleResult(CaseHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + viewBinding.refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + viewBinding.refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(202104286); + } + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override + public void onDestroyView() { + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); + } + super.onDestroyView(); + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java deleted file mode 100644 index aa188ce..0000000 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.casic.dcms.ui.fragment.handle; - -import android.content.Context; -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.LinearLayoutManager; - -import com.casic.dcms.adapter.CaseHandleAdapter; -import com.casic.dcms.base.AndroidxBaseFragment; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.ui.CaseHandleDetailActivity; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ToastHelper; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.List; - -public class OvertimeCaseFragment extends AndroidxBaseFragment implements ICaseListHandleView { - - private static final String TAG = "OvertimeCaseFragment"; - private Context context; - private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); - private boolean isRefresh, isLoadMore = false; - private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseHandleAdapter adapter; - private static WeakReferenceHandler weakReferenceHandler; - - @Override - protected void setupTopBarLayout() { - context = getContext(); - } - - @Override - protected void initData() { - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); - - weakReferenceHandler = new WeakReferenceHandler(this); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); - } - }); - } - - /** - * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 - */ - public static void sendEmptyMessage(int what) { - if (weakReferenceHandler == null) { - return; - } - weakReferenceHandler.sendEmptyMessage(what); - } - - private static class WeakReferenceHandler extends Handler { - private final WeakReference reference; - - private WeakReferenceHandler(OvertimeCaseFragment fragment) { - reference = new WeakReference<>(fragment); - } - - @Override - public void handleMessage(Message msg) { - OvertimeCaseFragment overtimeCaseFragment = reference.get(); - if (msg.what == Constant.CASE_HANDLE_OK) { - Log.d(TAG, "超时案卷处理成功，更新列表"); - overtimeCaseFragment.isRefresh = true; - //刷新之后页码重置 - overtimeCaseFragment.pageIndex = 1; - overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); - } else if (msg.what == 202104285) { - if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { - overtimeCaseFragment.adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (overtimeCaseFragment.dataBeans.size() == 0) { - overtimeCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); - } else { - overtimeCaseFragment.viewBinding.emptyView.hide(); - overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); - overtimeCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); - overtimeCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); - overtimeCaseFragment.viewBinding.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); - overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); - overtimeCaseFragment.startActivity(intent); - } - }); - } - } - } - } - } - - @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); - if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); - } - dataBeans.addAll(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - } - weakReferenceHandler.sendEmptyMessage(202104285); - } - } - - @Override - public void onDestroyView() { - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); - } - super.onDestroyView(); - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java deleted file mode 100644 index 3cac559..0000000 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.casic.dcms.ui.fragment.handle; - -import android.content.Context; -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.LinearLayoutManager; - -import com.casic.dcms.adapter.CaseHandleAdapter; -import com.casic.dcms.base.AndroidxBaseFragment; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.ui.CaseHandleDetailActivity; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ToastHelper; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.List; - -public class UrgentCaseFragment extends AndroidxBaseFragment implements ICaseListHandleView { - - private static final String TAG = "UrgentCaseFragment"; - private Context context; - private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); - private boolean isRefresh, isLoadMore = false; - private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseHandleAdapter adapter; - private static WeakReferenceHandler weakReferenceHandler; - - @Override - protected void setupTopBarLayout() { - context = getContext(); - } - - @Override - protected void initData() { - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); - - weakReferenceHandler = new WeakReferenceHandler(this); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); - } - }); - } - - /** - * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 - */ - public static void sendEmptyMessage(int what) { - if (weakReferenceHandler == null) { - return; - } - weakReferenceHandler.sendEmptyMessage(what); - } - - private static class WeakReferenceHandler extends Handler { - private final WeakReference reference; - - private WeakReferenceHandler(UrgentCaseFragment fragment) { - reference = new WeakReference<>(fragment); - } - - @Override - public void handleMessage(Message msg) { - UrgentCaseFragment urgentCaseFragment = reference.get(); - if (msg.what == Constant.CASE_HANDLE_OK) { - Log.d(TAG, "紧急案卷处理成功，更新列表"); - urgentCaseFragment.isRefresh = true; - //刷新之后页码重置 - urgentCaseFragment.pageIndex = 1; - urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); - } else if (msg.what == 202104286) { - if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { - urgentCaseFragment.adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (urgentCaseFragment.dataBeans.size() == 0) { - urgentCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); - } else { - urgentCaseFragment.viewBinding.emptyView.hide(); - urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); - urgentCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); - urgentCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); - urgentCaseFragment.viewBinding.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); - urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); - urgentCaseFragment.startActivity(intent); - } - }); - } - } - } - } - } - - @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainUrgentCaseList: " + new Gson().toJson(resultBean)); - if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); - } - dataBeans.addAll(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - } - weakReferenceHandler.sendEmptyMessage(202104286); - } - } - - @Override - public void onDestroyView() { - if (caseHandleListPresenter != null) { - caseHandleListPresenter.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 d0eceb3..19c865e 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 @@ -315,20 +315,20 @@ * @param isShop 是否三包,0-普通案卷,1-三包案卷 */ @GET("/case/toHandleListPage") - Observable obtainHandleCase(@Header("token") String token, - @Query("isOvertime") String isOvertime, - @Query("isEmergent") String isEmergent, - @Query("isShop") String isShop, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getHandleResult(@Header("token") String token, + @Query("isOvertime") String isOvertime, + @Query("isEmergent") String isEmergent, + @Query("isShop") String isShop, + @Query("limit") int limit, + @Query("offset") int offset); /** * 处理已办分页查询 */ @GET("/case/handledListPage") - Observable obtainHandledCase(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getHandleResult(@Header("token") String token, + @Query("limit") int limit, + @Query("offset") int offset); /** * 紧急案件分页查询 diff --git a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java index 8d81e65..7b53065 100644 --- a/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java +++ b/app/src/main/java/com/casic/dcms/listener/OnGetCaseHandleListListener.java @@ -1,9 +1,12 @@ package com.casic.dcms.listener; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; public interface OnGetCaseHandleListListener { void onSuccess(CaseHandleBean resultBean); + void onSuccess(CaseHandledBean resultBean); + void onFailure(Throwable throwable); } diff --git a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java b/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java deleted file mode 100644 index bc676f2..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/ICaseHandleListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.model; - -import rx.Subscription; - -public interface ICaseHandleListModel { - Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java new file mode 100644 index 0000000..b3ddf3b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/IHandleCaseModel.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.model; + +import rx.Subscription; + +public interface IHandleCaseModel { + Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset); + + Subscription handleCase(int offset); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java deleted file mode 100644 index 2e8e432..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/model/impl/CaseHandleListModelImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.casic.dcms.mvp.model.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.model.ICaseHandleListModel; -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 CaseHandleListModelImpl implements ICaseHandleListModel { - - private final OnGetCaseHandleListListener caseHandleListListener; - - public CaseHandleListModelImpl(OnGetCaseHandleListListener listener) { - this.caseHandleListListener = listener; - } - - /** - * {@link ICaseHandleListModel} - *

- * 案卷处理-超时案卷/紧急案卷/待办案卷列表 - * 地图查看案卷-处置中 - */ - @Override - public Subscription sendCaseHandleListRequest(String isOvertime, String isEmergent, int limit, int offset) { - Observable observable = RetrofitServiceManager.getCaseHandleListResult(isOvertime, - isEmergent, 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) { - caseHandleListListener.onFailure(e); - } - } - - @Override - public void onNext(CaseHandleBean resultBean) { - if (resultBean != null) { - caseHandleListListener.onSuccess(resultBean); - } - } - }); - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java new file mode 100644 index 0000000..8948d8f --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/model/impl/HandleCaseModelImpl.java @@ -0,0 +1,84 @@ +package com.casic.dcms.mvp.model.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.model.IHandleCaseModel; +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 HandleCaseModelImpl implements IHandleCaseModel { + + private final OnGetCaseHandleListListener caseHandleListListener; + + public HandleCaseModelImpl(OnGetCaseHandleListListener listener) { + this.caseHandleListListener = listener; + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-超时案卷/紧急案卷/待办案卷列表 + * 地图查看案卷-处置中 + */ + @Override + public Subscription handleCase(String isOvertime, String isEmergent, int limit, int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(isOvertime, + isEmergent, 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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandleBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } + + /** + * {@link IHandleCaseModel} + *

+ * 案卷处理-已处理 + */ + @Override + public Subscription handleCase(int offset) { + Observable observable = RetrofitServiceManager.handleCaseResult(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) { + caseHandleListListener.onFailure(e); + } + } + + @Override + public void onNext(CaseHandledBean resultBean) { + if (resultBean != null) { + caseHandleListListener.onSuccess(resultBean); + } + } + }); + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java deleted file mode 100644 index d290ada..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/ICaseListHandlePresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.presenter; - -public interface ICaseListHandlePresenter { - void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); - - void disposeRetrofitRequest(); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java new file mode 100644 index 0000000..41dc998 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/IHandleCasePresenter.java @@ -0,0 +1,9 @@ +package com.casic.dcms.mvp.presenter; + +public interface IHandleCasePresenter { + void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset); + + void onReadyRetrofitRequest(int offset); + + void disposeRetrofitRequest(); +} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java deleted file mode 100644 index bc1fe9b..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandlePresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.listener.OnGetCaseHandleListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandleListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandlePresenter; -import com.casic.dcms.mvp.view.ICaseListHandleView; - -public class CaseListHandlePresenterImpl extends BasePresenter implements ICaseListHandlePresenter, - OnGetCaseHandleListListener { - - private final ICaseListHandleView view; - private final CaseHandleListModelImpl actionModel; - - public CaseListHandlePresenterImpl(ICaseListHandleView caseHandleListView) { - this.view = caseHandleListView; - actionModel = new CaseHandleListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { - addSubscription(actionModel.sendCaseHandleListRequest(isOvertime, isEmergent, limit, offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandleBean resultBean) { - view.obtainCaseHandleList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java deleted file mode 100644 index 2e0d2bf..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/CaseListHandledPresenterImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.dcms.mvp.presenter.impl; - -import com.casic.dcms.bean.CaseHandledBean; -import com.casic.dcms.listener.OnGetCaseHandledListListener; -import com.casic.dcms.mvp.BasePresenter; -import com.casic.dcms.mvp.model.impl.CaseHandledListModelImpl; -import com.casic.dcms.mvp.presenter.ICaseListHandledPresenter; -import com.casic.dcms.mvp.view.ICaseListHandledView; - -public class CaseListHandledPresenterImpl extends BasePresenter implements ICaseListHandledPresenter, - OnGetCaseHandledListListener { - - private final ICaseListHandledView view; - private final CaseHandledListModelImpl actionModel; - - public CaseListHandledPresenterImpl(ICaseListHandledView caseHandledListView) { - this.view = caseHandledListView; - actionModel = new CaseHandledListModelImpl(this); - } - - @Override - public void onReadyRetrofitRequest(int offset) { - addSubscription(actionModel.sendCaseHandledListRequest(offset)); - } - - @Override - public void disposeRetrofitRequest() { - unSubscription(); - } - - @Override - public void onSuccess(CaseHandledBean resultBean) { - view.obtainCaseHandledList(resultBean); - } - - @Override - public void onFailure(Throwable throwable) { - - } -} diff --git a/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java new file mode 100644 index 0000000..3b8b01b --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/presenter/impl/HandleCasePresenterImpl.java @@ -0,0 +1,50 @@ +package com.casic.dcms.mvp.presenter.impl; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.listener.OnGetCaseHandleListListener; +import com.casic.dcms.mvp.BasePresenter; +import com.casic.dcms.mvp.model.impl.HandleCaseModelImpl; +import com.casic.dcms.mvp.presenter.IHandleCasePresenter; +import com.casic.dcms.mvp.view.IHandleCaseView; + +public class HandleCasePresenterImpl extends BasePresenter implements IHandleCasePresenter, OnGetCaseHandleListListener { + + private final IHandleCaseView view; + private final HandleCaseModelImpl actionModel; + + public HandleCasePresenterImpl(IHandleCaseView handleCaseView) { + this.view = handleCaseView; + actionModel = new HandleCaseModelImpl(this); + } + + @Override + public void onReadyRetrofitRequest(String isOvertime, String isEmergent, int limit, int offset) { + addSubscription(actionModel.handleCase(isOvertime, isEmergent, limit, offset)); + } + + @Override + public void onReadyRetrofitRequest(int offset) { + addSubscription(actionModel.handleCase(offset)); + } + + @Override + public void disposeRetrofitRequest() { + unSubscription(); + } + + @Override + public void onSuccess(CaseHandleBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onSuccess(CaseHandledBean resultBean) { + view.obtainHandleResult(resultBean); + } + + @Override + public void onFailure(Throwable throwable) { + + } +} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java b/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java deleted file mode 100644 index d7a89ec..0000000 --- a/app/src/main/java/com/casic/dcms/mvp/view/ICaseListHandleView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.dcms.mvp.view; - -import com.casic.dcms.bean.CaseHandleBean; - -public interface ICaseListHandleView { - void obtainCaseHandleList(CaseHandleBean resultBean); -} diff --git a/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java new file mode 100644 index 0000000..436339c --- /dev/null +++ b/app/src/main/java/com/casic/dcms/mvp/view/IHandleCaseView.java @@ -0,0 +1,10 @@ +package com.casic.dcms.mvp.view; + +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; + +public interface IHandleCaseView { + void obtainHandleResult(CaseHandleBean resultBean); + + void obtainHandleResult(CaseHandledBean resultBean); +} diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java index 2e5ac22..9124331 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleActivity.java @@ -10,9 +10,9 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.databinding.ActivityCaseHandleBinding; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseOverTimeFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import java.util.ArrayList; import java.util.List; @@ -30,8 +30,8 @@ @Override protected void initData() { List fragmentList = new ArrayList<>(); - fragmentList.add(new OvertimeCaseFragment()); - fragmentList.add(new UrgentCaseFragment()); + fragmentList.add(new CaseOverTimeFragment()); + fragmentList.add(new CaseUrgentFragment()); fragmentList.add(new CaseTodoFragment()); fragmentList.add(new CaseHandledFragment()); SubViewPagerAdapter adapter = new SubViewPagerAdapter(getSupportFragmentManager(), pageTitles, fragmentList); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index be3d75a..86bc63f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -28,9 +28,9 @@ import com.casic.dcms.mvp.view.ICaseNextNodeView; import com.casic.dcms.mvp.view.IUploadFileView; import com.casic.dcms.ui.fragment.handle.CaseHandledFragment; +import com.casic.dcms.ui.fragment.handle.CaseTimeoutFragment; import com.casic.dcms.ui.fragment.handle.CaseTodoFragment; -import com.casic.dcms.ui.fragment.handle.OvertimeCaseFragment; -import com.casic.dcms.ui.fragment.handle.UrgentCaseFragment; +import com.casic.dcms.ui.fragment.handle.CaseUrgentFragment; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.JzExoMedia; import com.casic.dcms.utils.OtherUtils; @@ -336,11 +336,11 @@ ToastHelper.showToast("案卷处理成功", ToastHelper.SUCCESS); switch (title) { case "超时案卷": - OvertimeCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseTimeoutFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "紧急案卷": - UrgentCaseFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); + CaseUrgentFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); CaseHandledFragment.sendEmptyMessage(Constant.CASE_HANDLE_OK); break; case "待办案卷": 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 c097722..1369d1b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -19,14 +19,15 @@ import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.CaseCheckBean; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.bean.CaseVerifyBean; import com.casic.dcms.bean.PointDataBean; 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.HandleCasePresenterImpl; import com.casic.dcms.mvp.presenter.impl.VerifyCasePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; import com.casic.dcms.mvp.view.ICheckCaseView; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.mvp.view.IVerifyCaseView; import com.casic.dcms.utils.ArcGisMapCreator; import com.casic.dcms.utils.Constant; @@ -54,10 +55,10 @@ import java.util.concurrent.ExecutionException; public class CaseOnMapActivity extends AndroidxBaseActivity implements RadioGroup.OnCheckedChangeListener, - ICaseListHandleView, IVerifyCaseView, ICheckCaseView { + IHandleCaseView, IVerifyCaseView, ICheckCaseView { private static final String TAG = "CaseOnMapActivity"; - private CaseListHandlePresenterImpl caseHandleListPresenter; + private HandleCasePresenterImpl handleCasePresenter; private VerifyCasePresenterImpl caseVerifyPresenter; private CaseCheckPresenterImpl caseCheckPresenter; private ListenableList graphics; @@ -93,12 +94,12 @@ arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); viewBinding.mapView.setMap(arcGISMap); - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); + handleCasePresenter = new HandleCasePresenterImpl(this); caseVerifyPresenter = new VerifyCasePresenterImpl(this); caseCheckPresenter = new CaseCheckPresenterImpl(this); //默认加载处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); //Marker相关Layer graphicsOverlays = viewBinding.mapView.getGraphicsOverlays(); @@ -211,7 +212,7 @@ viewBinding.checkRadioButton.setTextColor(ContextCompat.getColor(this, R.color.textColor)); //请求处置中数据 - caseHandleListPresenter.onReadyRetrofitRequest(null, null, 1000, 1); + handleCasePresenter.onReadyRetrofitRequest(null, null, 1000, 1); break; case 1: viewBinding.verifyRadioButton.setTextColor(ContextCompat.getColor(this, R.color.white)); @@ -238,8 +239,7 @@ * 处理中 */ @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainCaseHandleList: " + new Gson().toJson(resultBean)); + public void obtainHandleResult(CaseHandleBean resultBean) { clearPictureMarker(); if (resultBean.isSuccess()) { List rowsBeans = resultBean.getData().getRows(); @@ -265,6 +265,11 @@ } } + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + /** * 关联Marker和案卷 * @@ -390,8 +395,8 @@ @Override protected void onDestroy() { viewBinding.mapView.dispose(); - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); } if (caseVerifyPresenter != null) { caseVerifyPresenter.disposeRetrofitRequest(); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java index 14b04ff..392897c 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseHandledFragment.java @@ -13,10 +13,11 @@ import com.casic.dcms.adapter.CaseHandledAdapter; import com.casic.dcms.base.AndroidxBaseFragment; import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandledPresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandledView; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.ui.CaseHandledDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,12 +29,12 @@ import java.util.ArrayList; import java.util.List; -public class CaseHandledFragment extends AndroidxBaseFragment implements ICaseListHandledView { +public class CaseHandledFragment extends AndroidxBaseFragment implements IHandleCaseView { private static final String TAG = "CaseHandledFragment"; private Context context; private int pageIndex = 1; - private CaseListHandledPresenterImpl caseHandledListPresenter; + private HandleCasePresenterImpl handledCasePresenter; private boolean isRefresh, isLoadMore = false; private List dataBeans = new ArrayList<>(); private CaseHandledAdapter adapter; @@ -46,8 +47,8 @@ @Override protected void initData() { - caseHandledListPresenter = new CaseListHandledPresenterImpl(this); - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter = new HandleCasePresenterImpl(this); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -59,7 +60,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -67,7 +68,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseHandledListPresenter.onReadyRetrofitRequest(pageIndex); + handledCasePresenter.onReadyRetrofitRequest(pageIndex); } }); } @@ -97,7 +98,7 @@ handledFragment.isRefresh = true; //刷新之后页码重置 handledFragment.pageIndex = 1; - handledFragment.caseHandledListPresenter.onReadyRetrofitRequest(handledFragment.pageIndex); + handledFragment.handledCasePresenter.onReadyRetrofitRequest(handledFragment.pageIndex); } else if (msg.what == 202104288) { if (handledFragment.isRefresh || handledFragment.isLoadMore) { handledFragment.adapter.notifyDataSetChanged(); @@ -126,7 +127,12 @@ } @Override - public void obtainCaseHandledList(CaseHandledBean resultBean) { + public void obtainHandleResult(CaseHandleBean resultBean) { + + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -150,8 +156,8 @@ @Override public void onDestroyView() { - if (caseHandledListPresenter != null) { - caseHandledListPresenter.disposeRetrofitRequest(); + if (handledCasePresenter != null) { + handledCasePresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java new file mode 100644 index 0000000..2176313 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseOverTimeFragment.java @@ -0,0 +1,169 @@ +package com.casic.dcms.ui.fragment.handle; + +import android.content.Context; +import android.content.Intent; +import android.os.Handler; +import android.os.Message; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.base.AndroidxBaseFragment; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.databinding.FragmentHandleCaseBinding; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; +import com.casic.dcms.ui.CaseHandleDetailActivity; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +public class CaseOverTimeFragment extends AndroidxBaseFragment implements IHandleCaseView { + + private static final String TAG = "OvertimeCaseFragment"; + private Context context; + private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private boolean isRefresh, isLoadMore = false; + private HandleCasePresenterImpl handleCasePresenter; + private CaseHandleAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + handleCasePresenter = new HandleCasePresenterImpl(this); + /** + * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 + * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 + */ + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + pageIndex = 1; + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + } + }); + viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); + } + }); + } + + /** + * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private final WeakReference reference; + + private WeakReferenceHandler(CaseOverTimeFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseOverTimeFragment overtimeCaseFragment = reference.get(); + if (msg.what == Constant.CASE_HANDLE_OK) { + Log.d(TAG, "超时案卷处理成功，更新列表"); + overtimeCaseFragment.isRefresh = true; + //刷新之后页码重置 + overtimeCaseFragment.pageIndex = 1; + overtimeCaseFragment.handleCasePresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); + } else if (msg.what == 202104285) { + if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { + overtimeCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (overtimeCaseFragment.dataBeans.size() == 0) { + overtimeCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); + } else { + overtimeCaseFragment.viewBinding.emptyView.hide(); + overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); + overtimeCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); + overtimeCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); + overtimeCaseFragment.viewBinding.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); + overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "超时案卷"); + intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); + overtimeCaseFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainHandleResult(CaseHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + viewBinding.refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + viewBinding.refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(202104285); + } + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override + public void onDestroyView() { + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); + } + super.onDestroyView(); + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java index 473cf44..b6930fa 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseTodoFragment.java @@ -14,9 +14,10 @@ import com.casic.dcms.base.AndroidxBaseFragment; import com.casic.dcms.bean.ActionResultBean; import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.Constant; import com.casic.dcms.utils.ToastHelper; @@ -28,14 +29,14 @@ import java.util.ArrayList; import java.util.List; -public class CaseTodoFragment extends AndroidxBaseFragment implements ICaseListHandleView { +public class CaseTodoFragment extends AndroidxBaseFragment implements IHandleCaseView { private static final String TAG = "CaseTodoFragment"; private Context context; private int pageIndex = 1; private List dataBeans = new ArrayList<>(); private boolean isRefresh, isLoadMore = false; - private CaseListHandlePresenterImpl caseHandleListPresenter; + private HandleCasePresenterImpl handleCasePresenter; private CaseHandleAdapter adapter; private static WeakReferenceHandler weakReferenceHandler; @@ -46,12 +47,12 @@ @Override protected void initData() { - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); + handleCasePresenter = new HandleCasePresenterImpl(this); /** * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 */ - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); weakReferenceHandler = new WeakReferenceHandler(this); } @@ -63,7 +64,7 @@ public void onRefresh(@NonNull final RefreshLayout refreshLayout) { isRefresh = true; pageIndex = 1; - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); } }); viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -71,7 +72,7 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); + handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, pageIndex); } }); } @@ -101,7 +102,7 @@ caseTodoFragment.isRefresh = true; //刷新之后页码重置 caseTodoFragment.pageIndex = 1; - caseTodoFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); + caseTodoFragment.handleCasePresenter.onReadyRetrofitRequest(null, null, Constant.PAGE_LIMIT, caseTodoFragment.pageIndex); } else if (msg.what == 202104287) { if (caseTodoFragment.isRefresh || caseTodoFragment.isLoadMore) { caseTodoFragment.adapter.notifyDataSetChanged(); @@ -131,7 +132,7 @@ } @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { + public void obtainHandleResult(CaseHandleBean resultBean) { if (resultBean.isSuccess()) { List dataRows = resultBean.getData().getRows(); if (isRefresh) { @@ -154,9 +155,14 @@ } @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override public void onDestroyView() { - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); } super.onDestroyView(); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseUrgentFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseUrgentFragment.java new file mode 100644 index 0000000..39d7099 --- /dev/null +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/CaseUrgentFragment.java @@ -0,0 +1,169 @@ +package com.casic.dcms.ui.fragment.handle; + +import android.content.Context; +import android.content.Intent; +import android.os.Handler; +import android.os.Message; +import android.util.Log; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.casic.dcms.adapter.CaseHandleAdapter; +import com.casic.dcms.base.AndroidxBaseFragment; +import com.casic.dcms.bean.ActionResultBean; +import com.casic.dcms.bean.CaseHandleBean; +import com.casic.dcms.bean.CaseHandledBean; +import com.casic.dcms.databinding.FragmentHandleCaseBinding; +import com.casic.dcms.mvp.presenter.impl.HandleCasePresenterImpl; +import com.casic.dcms.mvp.view.IHandleCaseView; +import com.casic.dcms.ui.CaseHandleDetailActivity; +import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.ToastHelper; +import com.scwang.smartrefresh.layout.api.RefreshLayout; +import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; +import com.scwang.smartrefresh.layout.listener.OnRefreshListener; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; + +public class CaseUrgentFragment extends AndroidxBaseFragment implements IHandleCaseView { + + private static final String TAG = "UrgentCaseFragment"; + private Context context; + private int pageIndex = 1; + private List dataBeans = new ArrayList<>(); + private boolean isRefresh, isLoadMore = false; + private HandleCasePresenterImpl handleCasePresenter; + private CaseHandleAdapter adapter; + private static WeakReferenceHandler weakReferenceHandler; + + @Override + protected void setupTopBarLayout() { + context = getContext(); + } + + @Override + protected void initData() { + handleCasePresenter = new HandleCasePresenterImpl(this); + /** + * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 + * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 + */ + handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); + + weakReferenceHandler = new WeakReferenceHandler(this); + } + + @Override + protected void initEvent() { + viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(@NonNull final RefreshLayout refreshLayout) { + isRefresh = true; + pageIndex = 1; + handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); + } + }); + viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { + @Override + public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { + isLoadMore = true; + pageIndex++; + handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); + } + }); + } + + /** + * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 + */ + public static void sendEmptyMessage(int what) { + if (weakReferenceHandler == null) { + return; + } + weakReferenceHandler.sendEmptyMessage(what); + } + + private static class WeakReferenceHandler extends Handler { + private final WeakReference reference; + + private WeakReferenceHandler(CaseUrgentFragment fragment) { + reference = new WeakReference<>(fragment); + } + + @Override + public void handleMessage(Message msg) { + CaseUrgentFragment urgentCaseFragment = reference.get(); + if (msg.what == Constant.CASE_HANDLE_OK) { + Log.d(TAG, "紧急案卷处理成功，更新列表"); + urgentCaseFragment.isRefresh = true; + //刷新之后页码重置 + urgentCaseFragment.pageIndex = 1; + urgentCaseFragment.handleCasePresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); + } else if (msg.what == 202104286) { + if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { + urgentCaseFragment.adapter.notifyDataSetChanged(); + } else { + //首次加载数据 + if (urgentCaseFragment.dataBeans.size() == 0) { + urgentCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); + } else { + urgentCaseFragment.viewBinding.emptyView.hide(); + urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); + urgentCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); + urgentCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); + urgentCaseFragment.viewBinding.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); + urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { + @Override + public void onClick(int position) { + Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); + intent.putExtra("title", "紧急案卷"); + intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); + urgentCaseFragment.startActivity(intent); + } + }); + } + } + } + } + } + + @Override + public void obtainHandleResult(CaseHandleBean resultBean) { + if (resultBean.isSuccess()) { + List dataRows = resultBean.getData().getRows(); + if (isRefresh) { + dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 + dataBeans = dataRows; + viewBinding.refreshLayout.finishRefresh(); + isRefresh = false; + } else if (isLoadMore) { + if (dataRows.size() == 0) { + ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); + } + dataBeans.addAll(dataRows); + viewBinding.refreshLayout.finishLoadMore(); + isLoadMore = false; + } else { + dataBeans = dataRows; + } + weakReferenceHandler.sendEmptyMessage(202104286); + } + } + + @Override + public void obtainHandleResult(CaseHandledBean resultBean) { + + } + + @Override + public void onDestroyView() { + if (handleCasePresenter != null) { + handleCasePresenter.disposeRetrofitRequest(); + } + super.onDestroyView(); + } +} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java deleted file mode 100644 index aa188ce..0000000 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.casic.dcms.ui.fragment.handle; - -import android.content.Context; -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.LinearLayoutManager; - -import com.casic.dcms.adapter.CaseHandleAdapter; -import com.casic.dcms.base.AndroidxBaseFragment; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.ui.CaseHandleDetailActivity; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ToastHelper; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.List; - -public class OvertimeCaseFragment extends AndroidxBaseFragment implements ICaseListHandleView { - - private static final String TAG = "OvertimeCaseFragment"; - private Context context; - private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); - private boolean isRefresh, isLoadMore = false; - private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseHandleAdapter adapter; - private static WeakReferenceHandler weakReferenceHandler; - - @Override - protected void setupTopBarLayout() { - context = getContext(); - } - - @Override - protected void initData() { - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); - - weakReferenceHandler = new WeakReferenceHandler(this); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, pageIndex); - } - }); - } - - /** - * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 - */ - public static void sendEmptyMessage(int what) { - if (weakReferenceHandler == null) { - return; - } - weakReferenceHandler.sendEmptyMessage(what); - } - - private static class WeakReferenceHandler extends Handler { - private final WeakReference reference; - - private WeakReferenceHandler(OvertimeCaseFragment fragment) { - reference = new WeakReference<>(fragment); - } - - @Override - public void handleMessage(Message msg) { - OvertimeCaseFragment overtimeCaseFragment = reference.get(); - if (msg.what == Constant.CASE_HANDLE_OK) { - Log.d(TAG, "超时案卷处理成功，更新列表"); - overtimeCaseFragment.isRefresh = true; - //刷新之后页码重置 - overtimeCaseFragment.pageIndex = 1; - overtimeCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest("1", null, Constant.PAGE_LIMIT, overtimeCaseFragment.pageIndex); - } else if (msg.what == 202104285) { - if (overtimeCaseFragment.isRefresh || overtimeCaseFragment.isLoadMore) { - overtimeCaseFragment.adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (overtimeCaseFragment.dataBeans.size() == 0) { - overtimeCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); - } else { - overtimeCaseFragment.viewBinding.emptyView.hide(); - overtimeCaseFragment.adapter = new CaseHandleAdapter(overtimeCaseFragment.context, overtimeCaseFragment.dataBeans); - overtimeCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(overtimeCaseFragment.context)); - overtimeCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(overtimeCaseFragment.context, DividerItemDecoration.VERTICAL)); - overtimeCaseFragment.viewBinding.caseRecyclerView.setAdapter(overtimeCaseFragment.adapter); - overtimeCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(overtimeCaseFragment.context, CaseHandleDetailActivity.class); - intent.putExtra("title", "超时案卷"); - intent.putExtra("id", overtimeCaseFragment.dataBeans.get(position).getId()); - overtimeCaseFragment.startActivity(intent); - } - }); - } - } - } - } - } - - @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); - if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); - } - dataBeans.addAll(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - } - weakReferenceHandler.sendEmptyMessage(202104285); - } - } - - @Override - public void onDestroyView() { - if (caseHandleListPresenter != null) { - caseHandleListPresenter.disposeRetrofitRequest(); - } - super.onDestroyView(); - } -} diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java deleted file mode 100644 index 3cac559..0000000 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/UrgentCaseFragment.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.casic.dcms.ui.fragment.handle; - -import android.content.Context; -import android.content.Intent; -import android.os.Handler; -import android.os.Message; -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.LinearLayoutManager; - -import com.casic.dcms.adapter.CaseHandleAdapter; -import com.casic.dcms.base.AndroidxBaseFragment; -import com.casic.dcms.bean.ActionResultBean; -import com.casic.dcms.bean.CaseHandleBean; -import com.casic.dcms.databinding.FragmentHandleCaseBinding; -import com.casic.dcms.mvp.presenter.impl.CaseListHandlePresenterImpl; -import com.casic.dcms.mvp.view.ICaseListHandleView; -import com.casic.dcms.ui.CaseHandleDetailActivity; -import com.casic.dcms.utils.Constant; -import com.casic.dcms.utils.ToastHelper; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener; -import com.scwang.smartrefresh.layout.listener.OnRefreshListener; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.List; - -public class UrgentCaseFragment extends AndroidxBaseFragment implements ICaseListHandleView { - - private static final String TAG = "UrgentCaseFragment"; - private Context context; - private int pageIndex = 1; - private List dataBeans = new ArrayList<>(); - private boolean isRefresh, isLoadMore = false; - private CaseListHandlePresenterImpl caseHandleListPresenter; - private CaseHandleAdapter adapter; - private static WeakReferenceHandler weakReferenceHandler; - - @Override - protected void setupTopBarLayout() { - context = getContext(); - } - - @Override - protected void initData() { - caseHandleListPresenter = new CaseListHandlePresenterImpl(this); - /** - * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 - * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 - */ - caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); - - weakReferenceHandler = new WeakReferenceHandler(this); - } - - @Override - protected void initEvent() { - viewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(@NonNull final RefreshLayout refreshLayout) { - isRefresh = true; - pageIndex = 1; - caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); - } - }); - viewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { - @Override - public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { - isLoadMore = true; - pageIndex++; - caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, pageIndex); - } - }); - } - - /** - * 供{@link com.casic.dcms.ui.CaseHandleDetailActivity#obtainCaseHandleResult(ActionResultBean)}调用 - */ - public static void sendEmptyMessage(int what) { - if (weakReferenceHandler == null) { - return; - } - weakReferenceHandler.sendEmptyMessage(what); - } - - private static class WeakReferenceHandler extends Handler { - private final WeakReference reference; - - private WeakReferenceHandler(UrgentCaseFragment fragment) { - reference = new WeakReference<>(fragment); - } - - @Override - public void handleMessage(Message msg) { - UrgentCaseFragment urgentCaseFragment = reference.get(); - if (msg.what == Constant.CASE_HANDLE_OK) { - Log.d(TAG, "紧急案卷处理成功，更新列表"); - urgentCaseFragment.isRefresh = true; - //刷新之后页码重置 - urgentCaseFragment.pageIndex = 1; - urgentCaseFragment.caseHandleListPresenter.onReadyRetrofitRequest(null, "1", Constant.PAGE_LIMIT, urgentCaseFragment.pageIndex); - } else if (msg.what == 202104286) { - if (urgentCaseFragment.isRefresh || urgentCaseFragment.isLoadMore) { - urgentCaseFragment.adapter.notifyDataSetChanged(); - } else { - //首次加载数据 - if (urgentCaseFragment.dataBeans.size() == 0) { - urgentCaseFragment.viewBinding.emptyView.show("没有案卷需要处理", null); - } else { - urgentCaseFragment.viewBinding.emptyView.hide(); - urgentCaseFragment.adapter = new CaseHandleAdapter(urgentCaseFragment.context, urgentCaseFragment.dataBeans); - urgentCaseFragment.viewBinding.caseRecyclerView.setLayoutManager(new LinearLayoutManager(urgentCaseFragment.context)); - urgentCaseFragment.viewBinding.caseRecyclerView.addItemDecoration(new DividerItemDecoration(urgentCaseFragment.context, DividerItemDecoration.VERTICAL)); - urgentCaseFragment.viewBinding.caseRecyclerView.setAdapter(urgentCaseFragment.adapter); - urgentCaseFragment.adapter.setOnItemClickListener(new CaseHandleAdapter.OnItemClickListener() { - @Override - public void onClick(int position) { - Intent intent = new Intent(urgentCaseFragment.context, CaseHandleDetailActivity.class); - intent.putExtra("title", "紧急案卷"); - intent.putExtra("id", urgentCaseFragment.dataBeans.get(position).getId()); - urgentCaseFragment.startActivity(intent); - } - }); - } - } - } - } - } - - @Override - public void obtainCaseHandleList(CaseHandleBean resultBean) { -// Log.d(TAG, "obtainUrgentCaseList: " + new Gson().toJson(resultBean)); - if (resultBean.isSuccess()) { - List dataRows = resultBean.getData().getRows(); - if (isRefresh) { - dataBeans.clear();//下拉刷新必须先清空之前的List，不然会出现数据重复的问题 - dataBeans = dataRows; - viewBinding.refreshLayout.finishRefresh(); - isRefresh = false; - } else if (isLoadMore) { - if (dataRows.size() == 0) { - ToastHelper.showToast("到底了，别拉了", ToastHelper.INFO); - } - dataBeans.addAll(dataRows); - viewBinding.refreshLayout.finishLoadMore(); - isLoadMore = false; - } else { - dataBeans = dataRows; - } - weakReferenceHandler.sendEmptyMessage(202104286); - } - } - - @Override - public void onDestroyView() { - if (caseHandleListPresenter != null) { - caseHandleListPresenter.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 d0eceb3..19c865e 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 @@ -315,20 +315,20 @@ * @param isShop 是否三包,0-普通案卷,1-三包案卷 */ @GET("/case/toHandleListPage") - Observable obtainHandleCase(@Header("token") String token, - @Query("isOvertime") String isOvertime, - @Query("isEmergent") String isEmergent, - @Query("isShop") String isShop, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getHandleResult(@Header("token") String token, + @Query("isOvertime") String isOvertime, + @Query("isEmergent") String isEmergent, + @Query("isShop") String isShop, + @Query("limit") int limit, + @Query("offset") int offset); /** * 处理已办分页查询 */ @GET("/case/handledListPage") - Observable obtainHandledCase(@Header("token") String token, - @Query("limit") int limit, - @Query("offset") int offset); + Observable getHandleResult(@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 fe9d123..855ebe2 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 @@ -364,21 +364,21 @@ /** * 案卷处理分页查询，去掉三包类型的案卷 */ - public static Observable getCaseHandleListResult(String isOvertime, String isEmergent, - int limit, int offset) { + public static Observable handleCaseResult(String isOvertime, String isEmergent, + int limit, int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainHandleCase(AuthenticationHelper.getToken(), isOvertime, isEmergent, + return service.getHandleResult(AuthenticationHelper.getToken(), isOvertime, isEmergent, "0", limit, offset); } /** * 处理已办分页查询 */ - public static Observable getCaseHandledListResult(int offset) { + public static Observable handleCaseResult(int offset) { Retrofit retrofit = createRetrofit(); RetrofitService service = retrofit.create(RetrofitService.class); - return service.obtainHandledCase(AuthenticationHelper.getToken(), Constant.PAGE_LIMIT, offset); + return service.getHandleResult(AuthenticationHelper.getToken(), Constant.PAGE_LIMIT, offset); } /**